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
10,253 Commits 9 Branches 0 Tags
314911e458d35df55d1782ebf4efbc996887d726
Commit Graph

7871 Commits

Author SHA1 Message Date
Mloc
4fd90875bc Merge pull request #1904 from RawrTaicho/master 
Issue #1818 - Freeform Module Broken Again
 2012-11-10 09:27:37 -08:00
Mloc
35132b3036 Merge pull request #1901 from AterIgnis/hud_intent_better 
all-intents-intent-button
 2012-11-10 08:58:39 -08:00
Connor Reynolds
2f5621fedb Issue #1818 - Freeform Module broken again 
-Think- I fixed it. It shouldn't just stop the user after they enter the
law priority number now. Should work properly.
 2012-11-10 16:53:39 +00:00
Ater Ignis
20bdba6c67 all-intents-intent-button 
shows all possible intents on intent button and allows choosing needed one directly, without scrolling them all
 2012-11-10 14:19:02 +04:00
Ater Ignis
8b71b7d106 updated DNA code to have more mutations 2012-11-10 14:12:25 +04:00
Mloc
6bfdbdd606 Merge pull request #1898 from SniperYeti/master 
Security Belt Modifications (Added the stuff I missed)
 2012-11-10 01:15:26 -08:00
SkyMarshal
1eb2ceb643 Removed the /TG/ "feature" which has explosions insta-gib dead people. THIS IS WHY I HATE THE MERGE. 2012-11-09 22:30:38 -07:00
MrYeti
9f16527552 Update code/game/objects/items/weapons/storage/belt.dm 2012-11-09 19:36:12 -05:00
MrYeti
ea1d27a6a2 Update code/game/objects/items/weapons/storage/belt.dm 2012-11-09 19:26:47 -05:00
Ater Ignis
af0593e07b Chemistry on child reagents and in mobs 
Ethanol childs (most drinks in general) are treated as ethanol in reactions
Reactions are going inside mobs, but not make bubbling effect
 2012-11-09 20:53:20 +04:00
Chinsky
f45855078b Admin revive now fixes beheaded peps. 2012-11-09 20:29:03 +04:00
Ater Ignis
116b17e2be internal explosions 
if some explosive reaction occurs - it firstly tries to explode container, next the surroundings
if container is alive - it cuts half of explosion power, if it is dead in process - cut an half again
 2012-11-09 20:24:44 +04:00
Chinsky
73ebc5c248 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-09 20:13:09 +04:00
Chinsky
a134327512 Merge remote-tracking branch 'remotes/origin/revive' 2012-11-09 20:12:31 +04:00
Hawk-v3
3cfb201846 Merge pull request #1839 from AterIgnis/ed209 
ED209 not showing on remote-control chip of security PDA
 2012-11-09 07:42:09 -08:00
Hawk-v3
a114c79aca Merge pull request #1894 from comma/master 
Limb surgery
 2012-11-09 06:52:49 -08:00
Hawk-v3
86f3622d1c Merge pull request #1893 from SniperYeti/master 
Security Belt Modifications
 2012-11-09 06:50:25 -08:00
Hawk-v3
c4c065dfba Merge pull request #1885 from caelaislinn/bs12_with_tgport 
remaining map updates, plus misc
 2012-11-09 06:49:39 -08:00
Chinsky
a2f4c91e4a Made limbs prepeared for replacement stop hurt. 2012-11-09 18:07:02 +04:00
Chinsky
7a8899cf42 Updated admin revive to work with organs and bloodloss 2012-11-09 18:03:57 +04:00
Chinsky
18f56f4a38 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-09 14:32:49 +04:00
Chinsky
2bf2d11730 Merge branch 'limbsurgery' 2012-11-09 14:32:22 +04:00
Chinsky
5043147cfc Added prothesis instll surgery. 2012-11-09 13:22:55 +04:00
MrYeti
6a129ea312 Update code/game/objects/items/weapons/storage/belt.dm 
Added tasers and stun baton to the security belt and now has 7 slots.
 2012-11-08 22:31:32 -05:00
SkyMarshal
9b3389145e Fixed some runtimes with mulebots, the security computer, and the medical computer, as well as readded the nice prompt the cloner gives to ghosts when they are being cloned. Fixed an odd compile error. 2012-11-08 14:49:01 -07:00
Cael_Aislinn
6f77899396 should invert SSD to apply to normal disconnects, but not ghosting admins 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-11-08 22:20:34 +10:00
Chinsky
ef6d50b5c4 Added logging of status screen text change. 2012-11-08 15:44:34 +04:00
Chinsky
c55e290d4b updated configs on MLoc's request. 
Swapped loading mods and loading admins  in places during worldstart, so former mods will properly adminned.
Fixed paths for custom items.
 2012-11-07 20:35:02 +04:00
Chinsky
47db4eded3 Can attach limbs now. No preparations needed yet. 2012-11-07 20:01:55 +04:00
Kreastr
2e8b305ac3 Now gliding_size for pulled objects and mobs is also changed. 2012-11-07 13:13:45 +02:00
Kreastr
484351a200 Adapting glide size formula 2012-11-07 11:51:44 +02:00
Kreastr
cf01509f8e Split speed from actual delay time 2012-11-07 11:23:45 +02:00
Kreastr
2a80909a94 Making it work 2012-11-07 11:16:28 +02:00
Kreastr
bd6a7ec86b Merge fixes part2 2012-11-07 11:13:27 +02:00
Cael_Aislinn
d6b249b945 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-11-07 15:48:10 +10:00
Kreastr
f82952d347 Fixes 2012-11-07 01:39:56 +02:00
Kreastr
001ea33ce0 Merge branch 'animation' 
Merging animation fixes

Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_movement.dm
	config/admins.txt
 2012-11-07 01:38:28 +02:00
Kreastr
2deb70a1a9 Some changes. Untested. 2012-11-07 00:08:02 +02:00
Chinsky
9dc9198237 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-06 22:41:19 +04:00
Chinsky
a02a337fed Added option to call crew transfer to Comms computers. 2012-11-06 22:38:02 +04:00
Chinsky
b10b035552 Changed Command Channel color to more visible one. 2012-11-06 21:23:58 +04:00
Chinsky
1a02f2ff1c Proted instabeams for energy projectiles. 
Also buffed laser damage to pre-merge.
 2012-11-06 20:35:48 +04:00
Cael_Aislinn
0d77854520 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-11-06 23:04:47 +10:00
Chinsky
4a9c7b82ae Commented out gibbing when torso takes too much damage. Because no one likes when you gib someone by poking knife in their chest enough times. 2012-11-06 16:37:16 +04:00
Chinsky
5276c85664 medical belts can hold gloves and mask again. 2012-11-06 14:11:31 +04:00
Chinsky
9a4535be69 Added logging of thrower for stunbatons. 2012-11-06 13:29:01 +04:00
SkyMarshal
f66572b6a7 Merge pull request #1879 from comma/master 
Photos and flying batons
 2012-11-06 00:26:00 -08:00
cib
392bdd022f Removed the ability to create vira. 
This ability should return when virus2 is ported fully and the machinery is added to the map.

This also fixes a possible exploit where you can supply a fake href and spawn a singularity instead of a virus(luckily it won't be added to the map though, but you can still trigger any New() proc you want)
 2012-11-05 19:49:30 +01:00
Cael_Aislinn
b72b378f1e cigars and pipes can be lit by means other than matches 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-11-05 22:24:45 +10:00
Chinsky
5d62b98c18 Added 50% chance of thrown baton to stun mob 2012-11-05 14:46:00 +04:00