cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,471 Commits 9 Branches 0 Tags
8d9d83d5ef07d3d793417459b27ebb51b3a3fef2
Commit Graph

8891 Commits

Author SHA1 Message Date
Zuhayr
8d9d83d5ef Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-24 09:12:02 +10:30
Graham Lloyd
c764a94073 fixes some annoying punctuation errors. 2014-10-22 15:58:27 -04:00
Chinsky
2254d34a32 Merge pull request #6809 from Zuhayr/master 
Hydro tweaks, fixes #6808
 2014-10-22 02:30:27 +04:00
RavingManiac
782e9f520d Changed the wording of the sniper rifle/binoculars zoom messages. 
Updated changelog.
 2014-10-22 02:19:38 +08:00
Zuhayr
fc0cf32c2a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-21 18:30:37 +10:30
mwerezak
a01ed0134b Fixes #6807 2014-10-20 22:22:51 -04:00
Zuhayr
e4ff1a3088 Hydro tweaks, fixes #6808 2014-10-21 09:10:23 +10:30
Chinsky
bad385e1d1 Merge pull request #6791 from Zuhayr/dev 
Removes references to the Syndicate and renames nuclear emergency mode.
 2014-10-21 01:13:17 +04:00
GinjaNinja32
c5bba7f3a5 Re-move resource update 2014-10-20 17:26:55 +01:00
mwerezak
9afd8fe3c5 Fixes radio code conflict with galactic common 2014-10-19 21:52:04 -04:00
Chinsky
3796c034f3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev 
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
	maps/tgstation2.dmm
 2014-10-20 04:52:45 +04:00
Chinsky
0660dd392b Merge pull request #6785 from mwerezak/clothing-icon-update 
Fixes #6783
 2014-10-20 03:53:17 +04:00
Chinsky
61e50ab72a Merge pull request #6790 from mwerezak/robot-radio 
Fixes robot radio component not using power
 2014-10-20 03:53:10 +04:00
Chinsky
f0413bd9f6 Merge pull request #6787 from mwerezak/robot-camera 
Alternate fix to #6705
 2014-10-20 03:52:32 +04:00
Chinsky
b6df8111eb Merge pull request #6798 from PsiOmegaDelta/pAI 
pAI inquirer fix
 2014-10-20 03:50:52 +04:00
Chinsky
f1f730894c Merge pull request #6789 from mwerezak/binary-talk 
Allows properly keyed radios to broadcast in robot talk and/or hivemind + some cleanup
 2014-10-20 03:50:12 +04:00
PsiOmega
ff90d835d4 pAI inquirer fix 
pAI inquirer was never set, leading to a slightly grammatically incorrect request message.
 2014-10-19 18:09:45 +02:00
Zuhayr
99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
mwerezak
9424d892ba Fixes robot radio component not using power 
Also shifts power usage so binary talk uses less power while radio uses
more.
 2014-10-19 00:50:13 -04:00
mwerezak
b508098ba9 Fixes robot camera deactivation not kicking viewers 2014-10-18 23:07:36 -04:00
mwerezak
b8cfe87ca2 Fixes #6783, moves spacesuits to a separate file 
Adds an update_clothing_icon() proc to clothing items that will call the
relevant icon update proc on the mob which is equipping the clothing, if
any. Changes various clothing procs to not call update icon procs on usr
which may not even be the mob wearing the clothing.
 2014-10-18 22:12:15 -04:00
Chinsky
3c81881686 Merge pull request #6767 from PsiOmegaDelta/OutpostMining 
North Mining Outpost
 2014-10-19 01:42:41 +04:00
Chinsky
b610a78a3d Merge pull request #6769 from PsiOmegaDelta/Science 
HUD overlay improvements
 2014-10-19 01:42:39 +04:00
Chinsky
02a5226b8a Merge pull request #6772 from Zuhayr/master 
Fixes
 2014-10-19 01:42:36 +04:00
GinjaNinja32
e6c7713e02 Fix intent switching using Change-UI 2014-10-18 16:29:05 +01:00
Ravensdale
431d7a2581 Flower hairpin now works for ears and head slots 2014-10-17 20:12:03 -07:00
Zuhayr
bb0aa868f7 Amends a previous commit. 2014-10-18 08:42:28 +10:30
Zuhayr
678b278b12 Fixes #6683 2014-10-18 08:40:24 +10:30
Zuhayr
bce2059422 Fixes #6689 2014-10-18 08:37:23 +10:30
Zuhayr
96be563434 Fixes #6740 2014-10-18 08:03:46 +10:30
Zuhayr
e7e50e9f51 Fixes #6745 2014-10-18 07:57:18 +10:30
Zuhayr
dcca5ccb6e Fixes #6763 2014-10-18 07:52:27 +10:30
Zuhayr
08ca8e192a Fixes #6764 2014-10-18 07:38:33 +10:30
Zuhayr
9eb2809afb Fixes #6765 2014-10-18 07:34:46 +10:30
Hubblenaut
5cf2281db6 Hotfix for broken damage reading 2014-10-17 21:04:08 +02:00
PsiOmega
c4a9293727 HUD overlay improvements 
Reduces code duplication, increases code robustness, adds science googles overlay.
 2014-10-17 20:27:40 +02:00
PsiOmega
b9235571c4 Plops down a new mining outpost on the asteroid. 
Rather than having dirty miners inside the pure temple of science they now have a new tiny little outpost for their ore offloading needs.
 2014-10-17 13:49:18 +02:00
DJSnapshot
92ed4e5609 xenos need to hiss too 2014-10-16 22:09:48 -07:00
DJSnapshot
7ddd61b45c sanity check on facehuggers. 2014-10-16 21:56:43 -07:00
DJSnapshot
fc45762f18 removing world debug message. 2014-10-16 21:19:01 -07:00
Chinsky
1e8222c14f Merge pull request #6750 from Baystation12/dev-freeze 
Dev freeze -> Dev
 2014-10-16 20:07:35 +04:00
Zuhayr
839faaf5d9 Merge pull request #6737 from comma/conscience 
Couple o fixes
 2014-10-16 20:12:54 +10:30
Zuhayr
70dd21ab4c Fixes #6704 2014-10-16 15:04:47 +10:30
Zuhayr
00871b5207 Fixes #6724 2014-10-16 14:47:09 +10:30
Zuhayr
9563a54c7d Fixes #6725 2014-10-16 14:38:51 +10:30
Zuhayr
835e7b20c1 Possible fix for #6729 2014-10-16 14:16:44 +10:30
Zuhayr
87e0d89e58 Fixes #6726 2014-10-16 14:06:30 +10:30
Zuhayr
ca68281371 Fixes #6727 2014-10-16 14:06:16 +10:30
Zuhayr
adb58be3b0 Fixes #6728 2014-10-16 14:02:10 +10:30
Zuhayr
ff9bd99ee7 Fixes #6731 2014-10-16 13:51:25 +10:30