cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,408 Commits 10 Branches 0 Tags
a01ed0134b68235f8a44d34efd4c32e80c52723a
Commit Graph

8871 Commits

Author SHA1 Message Date
mwerezak
a01ed0134b Fixes #6807 2014-10-20 22:22:51 -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
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
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
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
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
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
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
Zuhayr
b611d6515a Fixes #6732 2014-10-16 13:48:26 +10:30
Mloc-Argent
4871a3a850 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	icons/atmos/pipes.dmi
 2014-10-15 22:13:44 +01:00
Zuhayr
ca13d1d5d8 Fixes chem splicing, bioluminescence and seed packets for xenobotany. 2014-10-15 10:05:50 +10:30
Chinsky
17d5b1dab3 Fixes #6608 2014-10-14 02:19:12 +04:00
Mloc
be7d30630d Merge pull request #6697 from Zuhayr/dev-freeze 
Xenos fixes, dev freeze fixes.
 2014-10-13 22:25:22 +01:00
Chinsky
d4b7e2d84b Merge pull request #6709 from Mloc/bs12-server 
testing fix for nui resources
 2014-10-14 01:14:54 +04:00
Miniature
1bb1045eeb Fix biosuits hiding shoes when they should not, #6691 2014-10-14 06:29:40 +10:30
Miniature
894ae39f7f Fix for everyone dying if they don't eat 2014-10-14 05:36:47 +10:30
Mloc-Argent
61839da570 testing fix for nui resources 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-10-13 20:01:54 +01:00
Zuhayr
01ddc9af6d Added binary to the AI. 2014-10-13 17:39:00 +10:30
Zuhayr
4c070bad02 Bunch of xeno fixes, details in PR. 2014-10-13 17:32:13 +10:30
Zuhayr
c5e2fa74e6 Fixes #6689 2014-10-13 17:16:23 +10:30
Zuhayr
06ad91f417 Fixes #6695 2014-10-13 17:00:26 +10:30
Zuhayr
45d6d6a610 Added Galactic Common to the AI. 2014-10-13 16:45:58 +10:30
Snapshot
9a706864b3 Merge pull request #6688 from Zuhayr/dev-freeze 
Dev freeze fixes
 2014-10-12 18:07:34 -07:00