cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,121 Commits 8 Branches 0 Tags
ef4ee093a5ffea35060dc846ffcb7015da65389c
Commit Graph

4228 Commits

Author SHA1 Message Date
cib
3dc4a56554 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-11-13 15:39:38 +01:00
Ispil
8814647be5 Fix to AIs and Cyborgs being able to "fall asleep" when they log off, but not being able to wake up when they return. They should no longer fall asleep. 2012-11-12 21:15:26 -07:00
Ispil
0a4d79e54f Fix to Tajaran/Skrell/Soghun not mrowling/warbling/hissing, respectively. 2012-11-12 20:39:42 -07:00
Mloc
daac550822 Revert movement speed changer glide thing I DONT KNOW THE NAME AAAH. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-11-12 21:54:16 +00:00
Mloc
d659b567a4 Fix for practice lasers. 
Addresses #1924
 2012-11-12 20:21:30 +00:00
cib
95181d96a8 Several fixes to germs. 2012-11-12 13:17:11 +01:00
cib
e92cecdefe Added basic germ code. 
This will only trigger in surgery for now - That is when you cut someone open in surgery, you'd better wash your hands before, or otherwise you'll get infected wounds.
 2012-11-12 12:51:28 +01:00
Ater Ignis
c293803f71 artifacts full list of effects enabled, contact based effect works on toucher, not artifact itself 2012-11-12 11:11:35 +04:00
MrYeti
78d7f9ee42 Added Graduation Lighter. Deleted my own custom item. 2012-11-11 18:00:12 -05:00
Mloc
ba3a9d37b2 Merge pull request #1916 from Kreastr/master 
Setting proper gliding_size for mobs and objects.
 2012-11-11 14:01:46 -08:00
SkyMarshal
f064da7f50 Some fixes to Detective Work. 2012-11-11 14:46:37 -07:00
SkyMarshal
ecdb9ab118 Fixed the sillies marked with "skytodo". Removed ONESIZEFITSALL flag as we removed fatness, replaced it with PLASMAGUARD flag as that is what we were using the value as previously. Firedoors should no longer be derpy. The remaining "skytodo"s are places where I have no idea what the fuck you wanted or no idea what the fuck needed done with it. 2012-11-11 14:33:33 -07:00
cib
a14ea29df3 Replaced monkey with confusion effect. 
Feature is new and don't want surprise monkeys.
 2012-11-11 19:35:01 +01:00
cib
a79ca39838 Forgot a spawn in trigger_side_effects 2012-11-11 19:09:36 +01:00
cib
fb295ee0cf Balancing for genetics side-effects: 
- The knockdown is now much shorter, meaning a geneticist may be able to give themselves the cure in time.
- Reduced radiation created from syringes, since there are other side-effects now.
 2012-11-11 18:51:02 +01:00
cib
d62aa1425f Fixed a few more bugs with genetic side effects. 2012-11-11 18:41:40 +01:00
cib
eb49378575 Added genetic side effects. 2012-11-11 18:15:12 +01:00
Kreastr
9ddc1d02d9 Merge branch 'master' of git://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/mob/mob_defines.dm
 2012-11-11 16:43:28 +02:00
Kreastr
0fe02fcd27 More clean up 2012-11-11 14:39:22 +02:00
cib
2522d5e7f1 Fixed up autoinjectors and added health analyzer to regular first aid. 2012-11-11 11:45:24 +01:00
SkyMarshal
bb3f533fb1 Merge pull request #1912 from Ravensdale/master 
AI custom sprites: Re-introducing three and adding in my own.
 2012-11-10 21:54:42 -08:00
Ravensdale
8cc22cbb15 Adjusts AI code to bring back custom cores and makes it easier to add in more. 2012-11-10 21:42:30 -08:00
RawrTaicho
f97f887458 Annnnnnnd another custom item: http://baystation12.net/forums/viewtopic.php?f=33&t=5413 2012-11-11 00:13:43 +00:00
RawrTaicho
864dbe8a84 http://baystation12.net/forums/viewtopic.php?f=33&t=5837 2012-11-10 23:43:24 +00:00
RawrTaicho
fde3147c5c - http://baystation12.net/forums/viewtopic.php?f=33&t=5801 2012-11-10 22:57:09 +00:00
Mloc
35132b3036 Merge pull request #1901 from AterIgnis/hud_intent_better 
all-intents-intent-button
 2012-11-10 08:58:39 -08: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
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
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
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
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
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
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
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
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
1a02f2ff1c Proted instabeams for energy projectiles. 
Also buffed laser damage to pre-merge.
 2012-11-06 20:35:48 +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
Hawk-v3
4a5c446191 Merge pull request #1875 from SkyMarshal/bugfixes 
Fixed Security HUD issues, reinstated old grenade behavior, de-nerfed Polyacid (now guarantees melted helmet, no other changes.)
 2012-11-05 01:32:47 -08:00
Asanadas
c49538aa8b I am ashamed 2012-11-04 21:35:49 -05:00
Asanadas
49adb9e5cb Anti-Rev removal compile fix. 2012-11-04 21:15:01 -05:00
SkyMarshal
70c2fb231d Fixed Security HUD issues, reinstated old grenade behavior, de-nerfed Polyacid 2012-11-04 16:17:35 -07:00
Chinsky
6256200c1a Added ability to clip photos to clipboards. 
Added ability to view photos from clipboards and folders.
 2012-11-04 21:03:17 +04:00