cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,538 Commits 8 Branches 0 Tags
01eeef048f9c1bab9f88de28f35e2c13cd69d08e
Commit Graph

8102 Commits

Author SHA1 Message Date
Cael_Aislinn
01eeef048f Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-01-30 13:13:37 +10:00
cib
f8ca13262c Fix issue #2193 2013-01-29 18:07:18 +01:00
RavingManiac
b121235cf8 Pepper spray blindness and eye blurriness durations quintupled. Condensed capsaicin recipe added (capsaicin + plasma catalyst). 2013-01-29 18:12:42 +08:00
Cael_Aislinn
fb2eb8008e resolved supply_pack runtime, added stuff to contraband pack to make it not-empty, added icon for absinthe 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-25 16:26:19 +10:00
Cael_Aislinn
3c06edc689 resolved lying sprite issue for atmos hardsuits, hair being hidden behind atmos hardsuit helmets, normalised a bunch of values across hardsuits (slowdown, mainly) 2013-01-25 11:48:17 +10:00
Cael_Aislinn
e7c10c44cd made delay round end work after restart timer has started, made delay verb also delay round end 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-24 15:38:23 +10:00
cib
5c97214b97 Removed an instance of spawning space ninjas I overlooked. This one would cause a space ninja to be spawned on every round, 6 minutes in. 2013-01-20 18:54:29 +01:00
cib
8de6998d83 Removed space ninja random event. 2013-01-18 23:37:51 +01:00
Cael Aislinn
c32f1ac100 Merge pull request #2192 from CIB/BEF-premerge 
Metabolism fix
 2013-01-16 00:25:18 -08:00
cib
e181b90ca2 Bugfix: Fix metabolism rates for foods, drinks and sleep toxins. 2013-01-16 02:55:23 +01:00
Cael Aislinn
a70cbeb519 Merge pull request #2186 from RavingManiac/master 
Changes to the minimum number of players needed for a game mode to start
 2013-01-15 17:26:38 -08:00
Mloc
cad798adad Merge pull request #2187 from CIB/BEF-premerge 
Merge pre-tg-merge BEF
 2013-01-15 13:29:59 -08:00
RavingManiac
558fad6428 required_players_secret added, which is the number of players needed for a game mode to start when that mode has been chosen at random. 
required_players for most modes reduced to the number of antagonists + 1, as the variable is only used when the game mode is explicitly voted for.
 2013-01-16 04:10:59 +08:00
GauHelldragon
77d22749f1 Hydroponics trays will update icons after being weeded now. 2013-01-13 17:30:27 -08:00
GauHelldragon
037f86aaf0 This belongs in bleeding edge, not master! 2013-01-03 16:12:17 -08:00
GauHelldragon
17317e3ff6 Fixes closets and destructive analyzer 
You can no longer load your robot modules into these. Fixes #2138
 2013-01-03 16:08:46 -08:00
GauHelldragon
673a233268 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-01-03 15:51:06 -08:00
Cael_Aislinn
e43e96d296 removed exploit where syndicate ids could make players untargettable 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-03 14:38:59 +10:00
Chinsky
8d0384ece4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-01-02 17:50:53 +04:00
GauHelldragon
e8f052d0c9 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-01-01 22:26:45 -08:00
GauHelldragon
e7d66f06cd Farmbots! Adds new file farmbot.dm 
A new type of buildable AI bot that assists in hydroponics
Waters plants, hoes weeds and uses fertilizers
 2012-12-30 15:24:58 -08:00
Hawk-v3
c612dd60da Merge pull request #2114 from GauHelldragon/master 
Robot HUD fixes
 2012-12-30 08:54:45 -08:00
Cael_Aislinn
0e9d6c163d runtime fix. the original code here was intended to make projectiles work with autopsy, but instead it just caused runtimes and made some mobs invulnerable 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-29 14:00:46 +10:00
GauHelldragon
50489f28ed Fixes cyborg display when items are disabled due to power. 
Previously the hud would not be updated when power drops below 100 and items are disabled.
 2012-12-28 13:51:09 -08:00
GauHelldragon
a116225433 Fixes cyborg HUDs security and medical HUDs 
The images now go away when the module isn't active
 2012-12-28 13:37:17 -08:00
cib
438226c7c8 Fixed another graphical error with crew manifests. 2012-12-24 21:20:17 +01:00
cib
39b12b280a Fixed a few problems with PDA crew manifest. 2012-12-24 21:13:29 +01:00
cib
03b52e77e6 Fix two compile errors. 2012-12-24 21:07:04 +01:00
cib
9ccfe7e310 Crew manifest now shows whether a crew member is SSD. 2012-12-24 21:03:26 +01:00
cib
6da98a0c00 Everyone now has crew manifest, and it uses the good version on PDA's. 2012-12-24 20:50:20 +01:00
cib
55c1ec2300 Added a display of active players in a job for latejoin. 2012-12-24 20:32:28 +01:00
cib
c5fb6aaf60 Low blood levels now actually make your nutrition drop. 
This'll help make people low on blood eat something.
 2012-12-24 20:20:15 +01:00
cib
d8ab9906f7 Blood transfer rate was too fast, slowed it down. 2012-12-24 19:54:30 +01:00
cib
53e500188b Fixes to the IV drip. 2012-12-24 19:09:45 +01:00
cib
d581ebe767 IV drips now can take blood as well as give it. 
This makes blood donations much easier.
 2012-12-24 18:25:48 +01:00
cib
026bbfa3b7 Implemented ghetto surgery tools. 2012-12-24 18:25:02 +01:00
Hawk-v3
aa9207ba44 Merge pull request #2102 from Ravensdale/master 
Station-wide boom sound
 2012-12-23 06:00:41 -08:00
Ravensdale
6a359474cc Update code/game/objects/explosion.dm 
Removing a repeat if statement
 2012-12-22 14:58:01 -08:00
Ravensdale
9d9061180d Port of z-level explosion sound effect from pre-merge. Tested and confirmed working with c-4, welding tanks, meteors and roro explosions, probably more! 2012-12-22 14:46:44 -08:00
Hawk-v3
0917269fe3 Merge pull request #2101 from Ravensdale/master 
Port: Ai cores
 2012-12-22 09:29:53 -08:00
Ravensdale
0ec910729c Porting of old AI cores. Introduces Triumverate, Serithi's TRIBUNAL sprite made public with permission. 2012-12-22 09:25:47 -08:00
cib
c354685bd7 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature 2012-12-22 17:56:02 +01:00
Hawk-v3
70b40dfc6b Merge pull request #2096 from comma/crates 
Crates
 2012-12-22 08:29:21 -08:00
Hawk-v3
5f77acd30e Merge pull request #2095 from comma/inspace 
Inspace
 2012-12-22 08:27:42 -08:00
Hawk-v3
9df91430fd Merge pull request #2097 from comma/surgery 
Surgery
 2012-12-22 08:27:18 -08:00
Hawk-v3
9e96fa8aca Merge pull request #2099 from Rowtree/master 
Camp Redacted - My map that cib wanted me to upload
 2012-12-22 08:25:15 -08:00
cib
767e9f33cf Reduced chemical metabolism and effect of chemicals. 
Most chemicals should now act just as strongly as before, but much more slowly.
 2012-12-22 02:51:40 +01:00
cib
5659e14668 Merge branch 'master' of github.com:Baystation12/Baystation12 into feature 2012-12-22 02:25:46 +01:00
Chinsky
6635fc2a83 Merge branch 'master' into inspace 2012-12-21 01:26:02 +04:00
Chinsky
b3580e8265 Merge branch 'master' into surgery 2012-12-21 01:07:36 +04:00