cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,884 Commits 6 Branches 0 Tags
fd7ddfa11aaaeec1fc85028f6a9f599d6377674d
Commit Graph

2653 Commits

Author SHA1 Message Date
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
Cael_Aislinn
2909b86195 this time, with the actual file 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-30 01:27:53 +10:00
Cael_Aislinn
c913f81517 played around with pets. hid a special one in the mining base 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-30 01:25:06 +10:00
Cael_Aislinn
1ecbc5c950 modified lockdown computer and blast doors / shutters on antiqua and exodus, now has increased usability etc. 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-29 03:28:50 +10:00
CIB
cae467ce39 Merge pull request #1531 from headswe/master 
Fixes a few runtime errors
 2012-07-28 08:55:22 -07:00
Head
3a1f30ece4 A few fixes. 2012-07-28 17:16:22 +02:00
CIB
63e826d119 Derp, edited the wrong variable 2012-07-28 17:01:20 +03:00
CIB
c1ec998c1f Fix power outage problems, take 2 2012-07-28 16:59:59 +03:00
CIB
c4b21c61f7 Quickfix for station losing power in less than 10 minutes 2012-07-28 16:50:10 +03:00
CIB
1952a6fc3a Lighting now turns off before equipment 2012-07-28 16:46:54 +03:00
Mloc
2569bb1d83 Merge pull request #1530 from caelaislinn/master 
tgstation.dmm mapfixes, antiqua.dmm engine updates, R-UST updates
 2012-07-28 04:42:03 -07:00
Cael_Aislinn
09687957d9 particles should actually dmg properly, instead of error. cant believe this didnt come up earlier 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-28 21:40:07 +10:00
Albert Iordache
3cf5cb0d3d Merge pull request #1522 from caelaislinn/powerchanges 
powerchanges
 2012-07-28 00:23:27 -07:00
Cael_Aislinn
760e86c4b0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-28 17:19:35 +10:00
Cael_Aislinn
6a713bc18b Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-27 21:42:03 +10:00
SkyMarshal
62dcb7be1b Adds caching to dummy objects, seems to work great. 2012-07-26 17:14:31 -07:00
SkyMarshal
af2af9d6b2 Attempted fix for ZAS possibly crashing BYOND, removed special case for Cryo from human life as it is already handled by cryo's return_air() proc, made breathing in superheated gas burn you a wee bit. 2012-07-26 12:10:16 -07:00
CIB
23e263e851 This hopefully fixes death-cryo 2012-07-26 20:22:54 +03:00
Cael_Aislinn
be5820dd51 revert power changes, moved them to a separate branch 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-27 02:22:03 +10:00
Cael_Aislinn
ca4979313a Merge branch 'master' of github.com:caelaislinn/Baystation12 2012-07-27 02:06:33 +10:00
Cael_Aislinn
0e6939de85 multiple R-UST tweaks and slight updates. this should fix any (all?) known outstanding bugs. i also modified values to be a bit more gameplay sensible (max average output on standard operating levels is ~150-200k per gen) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-27 02:04:44 +10:00
Cael_Aislinn
8e9c2670be reduced smes starting power to 50% 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-26 19:23:28 +10:00
Cael_Aislinn
353396f2cc tripled default computer power usage, tripled default machinery power usage (both active and idle), doubled emp power drain, tripled SMES starting power (from 30% to 90%) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-26 18:54:46 +10:00
Albert Iordache
f5a641211f Merge pull request #1514 from SkyMarshal/master 
ZAS is now even more reliable, being capable of working properly in all situations I was able to throw at it.  Increases specific heat of all normal gases to increase sensitivity of players to heat differences.
 2012-07-25 11:33:56 -07:00
CIB
113d4c67bf Update code/modules/mob/living/parasite/meme.dm 
Meme: Dumped the cost of Thought from 150 to 50
 2012-07-25 20:33:25 +03:00