cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,147 Commits 5 Branches 0 Tags
a13b922ed8b5bd4878a8085a7c4303a8e8a06589
Commit Graph

2749 Commits

Author SHA1 Message Date
Asanadas
a13b922ed8 My attempts at adding custom items for executivekill http://baystation12.net/forums/viewtopic.php?f=33&t=5156 
and thejesster14
http://baystation12.net/forums/viewtopic.php?f=33&t=4936

Signed-off-by: Asanadas <asanadas@hotmail.com>
 2012-09-07 17:59:01 -04:00
SkyMarshal
cf04246f96 Revert "Random not much finished bullshit work on mapdata." 
This reverts commit d3179bb5b5.
 2012-09-06 15:51:23 -07:00
SkyMarshal
4d7b17208d Update for everyone wishing to make a spacecraft, has a small map file (7x9) of a effective supermatter reactor (untested) and some changes to allow TEG's to be rotated. 
Signed-off-by: SkyMarshal <skymarshal1729@gmail.com>
 2012-09-06 15:48:11 -07:00
SkyMarshal
0532c59cb5 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-09-06 15:44:21 -07:00
Cael_Aislinn
1b307f26de custom item stuff: updated roaper(enos adlai) comfy hat sprite, added searif (ara al-jazari) classy bartender uniform, sirribbit (james mcreary) mcreary's journal, serithi (tribunal) custom ai sprites (player has manual selection of both normal and malf states), removed (commented out) searif's one nations flagmask 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-09-01 00:27:24 +10:00
Mloc
f53b079bb9 Merge pull request #1688 from comma/master 
More wedding thingies
 2012-08-26 11:05:38 -07:00
Chinsky
a2114056f7 More dresses for the dress god! 
Also cake closet sprite.
 2012-08-26 22:02:40 +04:00
SkyMarshal
ffa80e2e94 Ultralight update, less laggy and less buggy. Might still need to be removed, time will tell. Also: Added an Ion Storm law, and reverted the radio mode change back to the new subspace radios. Also added myself to the admins.txt since I am a dev again and the main server already is updated like that. 2012-08-21 17:25:57 -07:00
Erthilo
caf88d81eb Merge pull request #1666 from SkyMarshal/master 
Fixes for ZAS, including fire, geometry, rebuilding consideration, and atmospheric lockdowns.
 2012-08-21 06:44:27 -07:00
SkyMarshal
d41ffc18fd Fixes for ZAS, including fire, geometry, rebuilding consideration, and atmospheric lockdowns. In addition, improved supermatter, and humans now absorb all the oxygen they inhale, due to the ludicrous volumes of air normally encountered (Does not reduce effectiveness of air tanks) 2012-08-21 01:18:01 -07:00
SkyMarshal
4da0bc8873 Merge pull request #1657 from Erthilo/master 
HUD updates, roach nerf
 2012-08-19 00:03:07 -07:00
Erthilo
6a6a97b551 Reduces roach damage. 2012-08-19 03:58:39 +01:00
Erthilo
72822c8978 SecHuds and MedHuds can now view appropriate records. MedHuds can now set Physical Status. 2012-08-19 03:57:44 +01:00
SkyMarshal
33f9beb560 Merge pull request #1654 from Erthilo/master 
Mining lag reduction, sleepy pen, xenos, centcomm console
 2012-08-18 18:34:10 -07:00
Erthilo
08b2b326e9 Ores now stack when released from ore box. Should help reduce some mining lag. 2012-08-19 01:59:53 +01:00
Erthilo
a93db06afb Rebalanced sleepy pen, takes about 30 seconds to fall asleep, and 2 minutes total from stabbing to wear off. Fixes aliens, can no longer be pushed over by airflow, and all their powers work correctly. CentComm console has a 5 second cooldown now. 2012-08-18 21:32:21 +01:00
Mloc
f7d1790608 Merge pull request #1652 from Erthilo/master 
Lots of Fixes
 2012-08-18 12:07:55 -07:00
comma
737c96a1e6 Added FABULOUS white suit. 2012-08-18 21:58:00 +04:00
Erthilo
88e41b1db1 Fixes mice not being able to ghost when using Re-enter corpse. 2012-08-18 18:31:18 +01:00
Erthilo
a8c3cdbe42 Fixes some derpy naming with 's. 2012-08-18 18:30:58 +01:00
Erthilo
f521a4b739 Fixes alien whitelist popup for those not using the whitelist. 2012-08-18 18:28:26 +01:00
Erthilo
e68e49fdb9 Fixes simple_animal me command and mice making clonking noises in disposals. 2012-08-18 18:26:39 +01:00
Erthilo
6fed058680 Fixes Tajarans and all mutant races spawning with no hair, etc. Partially fixes morph mutation. Fixes mutations. 2012-08-18 18:25:23 +01:00
Erthilo
7da0507c8a Hotfix for mice being able to use MouseDrop, fixing mice stripping people, donut boxes, etc. Also allows mice/parrots/kobolds/cats to die from low air or heat/cold. 2012-08-18 17:08:53 +01:00
comma
f782298006 Fixes headless monkey curse (issue #1450) 2012-08-18 16:13:47 +04:00
comma
558e6a8b7f Added wedding dress, formal woman wear and STRIPPER GEAR. 2012-08-18 15:50:09 +04:00
CubeJackal
66f0fab77e Set icon for dart shells to new sprite 2012-08-17 05:22:59 +01:00
SkyMarshal
0cca49a92f Should fix singularity maybe crashing from eating signs. 2012-08-14 16:40:21 -07:00
SkyMarshal
d3179bb5b5 Random not much finished bullshit work on mapdata. 2012-08-14 09:55:57 -07:00
CIB
031677a515 Merge pull request #1601 from caelaislinn/master 
various WIP xenoarch update, some runtime and crash fixes
 2012-08-11 06:00:35 -07:00
CIB
e94a508e78 Fixed a runtime 2012-08-11 05:23:22 -07:00
Cael_Aislinn
7423ec7831 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-08-11 20:28:14 +10:00
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
CIB
c375935846 Nerfed damage from touching light bulbs 2012-08-10 12:00:40 -07: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
headswe
8103abcd9f Merge pull request #1583 from CIB/cib 
Full wound system rewrite - Tested and ready to merge
 2012-08-10 09:18:28 -07: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
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
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
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
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