cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,956 Commits 5 Branches 0 Tags
0d94175887bee05e3decc39b1091e030b555210c
Commit Graph

2677 Commits

Author SHA1 Message Date
Mloc
0d94175887 Merge pull request #1585 from comma/master 
Surgery fixes and tweaks
 2012-08-08 06:44:45 -07:00
comma
138e41dd54 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/objects/items/weapons/surgery_tools.dm

Did not do a pull in ages, all constants I sued in surgery code got renamed.
 2012-08-08 13:21:47 +04:00
Cael_Aislinn
e4600a8fa7 tweaks / fixes to carp a bit, removes munchkin from tgstation.dmm 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-07 21:23:55 +10:00
CIB
791e481d6e Removed a lagtastrous item 2012-08-06 14:12:04 -07:00
comma
fe41c6ea1e Stops processing metroid's life after it's dead. 
Fixes issue #1463

Signed-off-by: comma <krauchinsky@gmail.com>
 2012-08-06 21:11:58 +04:00
comma
c9785bbeff Cannot weld strange rocks with unlit welder anymore. 
Fixes issue #1454
 2012-08-06 19:34:59 +04:00
Cael_Aislinn
f52eb099f7 tweaks, fixes and additions to carp and simple_animals 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-07 00:03:56 +10:00
Cael_Aislinn
3e6f253cb7 various tweaks to energy fields, energy field artifacts (some outstanding bugs still) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-06 05:13:02 +10:00
Cael_Aislinn
136b8e44e3 oops 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-06 00:17:05 +10:00
Cael_Aislinn
d7bd58b8f3 roach remains have a bit more substance now 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-05 21:47:03 +10:00
Cael_Aislinn
52fdda910a mice can crawl through vents and hide under objects 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-05 21:03:16 +10:00
Cael_Aislinn
bece31d819 fix for mouseception naming bug 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-05 20:00:43 +10:00
Cael_Aislinn
eaa28099d3 compile fixes, more tweaks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-05 03:52:17 +10:00
Cael_Aislinn
2b2017126a tweaks to simple_animals, carps no longer freeze / require oxy to live (but rapidly burn up from 25+ degree temp), kobolds no longer require oxy to live 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-05 03:13:49 +10:00
CIB
429b04149a Merge pull request #1570 from caelaislinn/master 
various simple_animal tweaks, fixes and improvements
 2012-08-04 02:48:55 -07:00
CIB
e0c67241cf Added cyborg to jobbans for security etc. 2012-08-04 12:41:50 +03:00
Cael_Aislinn
93f864083c doubled zas debug sensitivity, some tweaks to mouse/ghost spawning 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 19:23:40 +10:00
Cael_Aislinn
714a9b120f compile fix 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 15:56:18 +10:00
Cael_Aislinn
46a450069e - simple_animals can't open doors by default 
- alien larvae, mice can hide under mobs
- roaches, mice can hide under various objects
- various tweaks, including flavour and existing mechanics
- fix for ghosts not being able to spawn as mice
- added move delay of half a second to simple_animals (about the same as human walkspeed?)
- simple_animals, when talking, can only understand each other (and mobs with universal_speak)

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 15:47:56 +10:00
Cael_Aislinn
c4ba455f35 added var to /mob to allow some mobs to share spaces 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 13:12:17 +10:00
Cael_Aislinn
4a460f24f3 compile fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 04:07:54 +10:00
Cael_Aislinn
08f47799e1 ghosts/observers can possess mice at will 2012-08-04 03:57:16 +10:00
Cael_Aislinn
7401f53d75 tweaks to vermin spawning 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 03:41:59 +10:00
Cael_Aislinn
6e0046c77d players who died while in control of simple_animals should now have their name display properly 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 01:42:48 +10:00
Cael_Aislinn
fd7ddfa11a removed all kobold speak messages 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 00:28:48 +10:00
Cael_Aislinn
e695bf3ed1 removed hanging simple_make options 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 20:27:33 +10:00
Cael_Aislinn
1c2bb7e750 fixes to vermin spawning, replaced rag spawners in map with actual rags 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 20:21:43 +10:00
Cael_Aislinn
10d40abb25 fix for kobolds doing things while dead 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 19:30:23 +10:00
Cael_Aislinn
1f0d8d7db0 modified the changelog, and made roaches die on bump() 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-02 21:56:26 +10:00
Cael_Aislinn
f3180fed6d possible fix for recent crash /shrug 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-02 18:47:14 +10:00
Cael_Aislinn
e9d68bd249 vermin spawn randomly in maintenance (plus a couple of other areas) at a rate of one every 10-15 mins. 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-02 15:39:00 +10:00
Cael_Aislinn
4a9383b5af reworked id spawning, added some fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-02 14:33:19 +10:00
Cael_Aislinn
b535890090 Merge branch 'capspace' of https://github.com/FireFishie/Baystation12 2012-08-02 04:58:16 +10:00
Cael_Aislinn
7ae269f38f some tweaks to mice and roaches, tried to get the gameticker to periodically spawn them but failed (will come back to) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-02 04:56:48 +10:00
Cael_Aislinn
469a8bb601 ported over the majority of /tg's simple_animal code and changed a lot of things for simple_animals and critters 
- added bears, mice (cats will chase mice, mice squeak occasionally)
- removed some unique simple_animals (ian and runtime will be the only ones for now)
- structure improvements, tweaks and cleanup for simple_animals and critters
- space carp should work fine now
 2012-08-02 03:22:44 +10:00
FireFishie
8a9962a234 By vote, space proofed captain armor and changed the memo 
Vote link and new memo message in the comments!
 2012-08-01 03:58:50 -04:00
CIB
e9937050aa Merge pull request #1558 from FireFishie/closets 
Some minor changes, mostly related to wardrobes and fluff text
 2012-08-01 00:23:05 -07:00
Albert Iordache
c3c6b6b557 Fixed a ChemMaster exploit. Thanks to Doohl for fixing, and LLA admins for letting us know 2012-07-31 17:22:43 +03:00
FireFishie
fae6f2eecd "Space Law" on the wiki is always capitalized, so now it should be in-game too. 2012-07-31 04:45:07 -04:00
FireFishie
8c7592fa00 Changed all entries of "Nanotrasen" to "NanoTrasen" and corrected the misspelling of "apologize" in the gravity toggle messages. 2012-07-31 01:14:14 -04:00
Nerezza
973c1ea876 Update code/modules/customitems/item_spawning.dm 2012-07-30 12:32:35 -05:00
Nerezza
ea9af8242e modified: code/modules/customitems/item_defines.dm 
modified:   code/modules/customitems/item_spawning.dm
	modified:   icons/obj/custom_items.dmi
 2012-07-30 10:15:22 -05:00
CIB
35eb1a52c6 Merge pull request #1546 from Mloc/dev 
Null checks, fixed cael's derp.
 2012-07-29 13:18:43 -07:00
CIB
79d4c39754 Fixed cryo pressure damage 2012-07-29 23:15:42 +03:00
Mloc
ba370735ff NULL checks. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-07-29 18:34:12 +01:00
Mloc
333f0903e8 Merge pull request #1534 from caelaislinn/master 
blast doors, lockdown comp, pets
 2012-07-29 08:46:18 -07:00
Jim "Apples"
af8324ec7d Merge pull request #1543 from Mloc/dev 
Custom items + New cow sprite.
 2012-07-29 08:37:33 -07:00
Mloc
4d240daa7e Custom items + New cow sprite. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-07-29 16:32:52 +01:00
Mloc
b34aae0c05 Merge pull request #1542 from comma/master 
Fix for admin rejuv
 2012-07-29 08:32:05 -07:00
comma
60f87cf538 Fix for admin rejuv breaking examine 2012-07-29 19:30:07 +04:00