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

5237 Commits

Author SHA1 Message Date
Cael_Aislinn
c5d598596e moved reagents and recipes purely used for xenoarch to a new file, forgot to commit some icons, tweaks to a bunch of xenoarch stuff 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-11 20:27:30 +10:00
Cael_Aislinn
782510645a tweaks to the bunsen burner, added a grinder (automated mortar and pestle) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-11 20:25:54 +10:00
Cael_Aislinn
b72e96c08d modified chemical reactions to preserve reagent data across reagents, if it exists. also made possible reactions with multiple products 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-11 20:24:51 +10:00
Cael_Aislinn
f33ee15700 fixed up some singularity ignores 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-11 12:44:11 +10:00
Cael_Aislinn
6ded63b850 various potential runtime / crash fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-11 03:11:45 +10:00
Cael_Aislinn
626c782ff2 new xenoarchaeology tools, basic datum for xenoarch work (WIP stuff) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-11 02:37:01 +10:00
Cael_Aislinn
c6cef3ea98 moved and tweaked the xenoarch finds a bit 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-11 02:17:07 +10:00
Cael_Aislinn
1bd9e86b84 added chemistry cooker (bunsen burner) and the capacity for recipes that require heating 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-11 02:16:04 +10:00
Mloc
5ac03a38d5 Merge pull request #1599 from caelaislinn/master 
zas debugging
 2012-08-09 19:12:41 -07:00
Cael_Aislinn
77d031b230 removed false positive, doubled zas debug sensitivity 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-10 12:11:21 +10:00
Mloc
d92887ed42 Merge pull request #1598 from caelaislinn/master 
zas debugging
 2012-08-09 18:10:19 -07:00
Cael_Aislinn
b805dce8e1 additional zas debugging 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-10 11:06:27 +10:00
Mloc
43b255f867 Made adminhelps go to the moderator channel. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-08-09 21:43:45 +01:00
Cael_Aislinn
3b9acf1c9e replaced log_admin with log_adminwarn, so hopefully the messages will output to server 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-10 01:41:17 +10:00
Cael_Aislinn
0fe99d3b6d actually make the debug messages output >.> also fixed up a couple of messages 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-10 01:24:40 +10:00
Cael_Aislinn
dca3f3bd8a reworked/verbosified some zas debugging, added additional zas debugging, made kill_air available to game_admins as well as game_masters, increased runtime check sensitivity to aid in debugging 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 18:12:59 +10:00
Cael_Aislinn
15fa23331b custom id cards should be able to access atms 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 14:51:59 +10:00
Cael_Aislinn
2abbd8ce6b compile fix, tweaks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 04:53:29 +10:00
Cael_Aislinn
ab0fe32f84 additional debugging tweaks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 04:49:18 +10:00
Cael_Aislinn
9307b00513 tweaks to simple_animal emotes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 04:42:44 +10:00
Cael_Aislinn
34000482c7 additional zas debugging, kill_air output made a bit more informative 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 04:42:26 +10:00
Cael_Aislinn
06f223ec6a ghosts properly retain their human names 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 03:29:20 +10:00
Cael_Aislinn
d817bbb490 more verbose zas debugging, decreased runtime sensitivity by half again, and reset the counter every time a tick is successful 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-09 03:19:50 +10:00
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
0021fe1f49 Nerfed changeling absorb objectives to 2-4 2012-08-06 15:24:50 -07:00
CIB
791e481d6e Removed a lagtastrous item 2012-08-06 14:12:04 -07:00
CIB
fafe55632b Merge pull request #1582 from FireFishie/hat2 
Captain's cap is now a hat
 2012-08-06 12:52: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
comma
2e6da1ab7a Surgery changes. 
Gameplay-wise:
-Made all messages consistent, no more message about 'beginning' to do something when actually it's done. (Addresses Issue #1540)
-Now to attack patient on table with surgery tool you need to have harm intent (Addresses Issue #1540)
-All surgeries now have delays and begin/finish messages on each step, much like bone surgery.

Code-wise:
-All code handling surgery steps was moved in appropriate procs for each tool, to get rid of one HUGE attack proc.
Now attack proc checks for prereqs for surgery (like masks covering face), checks for targeted zone and calls needed proc.
-Deleted all code that handled messages for when user performs surgery on himself, because that's honest to god dead code. You need to be down to get surgery don on you, and you can't use tools while down. So until something is changed, those messages removed to improve readability of code.
-Added interrupt proc, that handles interruptions during surgery for each tool. For now all types of surgery handled the same, may be implemented differently later.

Signed-off-by: comma <krauchinsky@gmail.com>
 2012-08-06 19:07:48 +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
FireFishie
9b4cdb357e Captain's cap is now a hat 
-Traded the Captain's cap back for the hat, as the cap is actually not all that sensible
 2012-08-06 06:50:31 -04:00
Cael_Aislinn
bc58cbe6a3 fix for announcement bug 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-06 17:21:46 +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
Albert Iordache
27920a6c59 Merge branch 'mechrevert' of https://github.com/Nerezza/Baystation12 into Nerezza-mechrevert 
Conflicts:
	code/game/mecha/mecha.dm
 2012-08-04 22:48:25 +03: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
Cael_Aislinn
321e8e9e21 uncommented some missing supply datums 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-05 02:21:45 +10:00
Albert Iordache
0fd0f5dbf0 Merge pull request #1571 from caelaislinn/master 
compile fixes
 2012-08-04 04:03:01 -07:00
Albert Iordache
e685276c91 Merge pull request #1569 from FireFishie/map3 
Minor map changes and a changelog
 2012-08-04 04:00:04 -07:00
Cael_Aislinn
6d0058a31e fix for contraband >.>, also simple_animals can't buckle themselves in now 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 20:58:53 +10:00
Cael_Aislinn
8d4f6a8efe admins can change the serial number of a rolled up poster to change the poster decal type when applied. note that you'll need to change the name of the rolled up poster to reflect this if you want to avoid confusion 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 20:00:59 +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