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

11827 Commits

Author SHA1 Message Date
Kani0824
7a7fc7e1ea Removed book that causes braindeadness 
Choosing a certain religion name and/or deity causes player to start out with 100 brain loss.  Removed that.
 2014-01-17 18:06:30 -05:00
DJSnapshot
04b47fa6a0 Merge pull request #4302 from Ccomp5950/mouse_antagHUD 
AntagHUD restrictions, disallow players becoming mice.
 2014-01-15 22:23:38 -08:00
Ccomp5950
90ce5b2b69 SPACE2TAB modules/projectiles/guns/energy/special.dm 
No changes other then space2tab is done in this commit.
 2014-01-15 23:42:55 -06:00
Ccomp5950
039d2d75bf Merge pull request #4288 from BcTpe4HbIu/master 
Fix for broken on spawn chem_dispenser
 2014-01-15 20:44:57 -08:00
Ccomp5950
775d75d2f4 Merge pull request #4301 from Loganbacca/bayfix-master 
Multiple typo and bug fixes
 2014-01-15 14:04:10 -08:00
Ccomp5950
78c032b317 AntagHUD restrictions, disallow players becoming mice. 
If antagHUD respawn restrictions are enabled, players will no longer be able
to use the "become mouse" verb if they have enabled their antagHUD's.

Observers were able to use antagHUD then become mice and die resetting their "has_used_antagHUD" variable allowing them to respawn bypassing the restrictions by becoming a mouse as well as respawning later.
 2014-01-15 03:25:13 -06:00
Loganbacca
682dfd5670 More typo fixes 
Missed these in the last commit.
 2014-01-15 20:03:12 +13:00
Loganbacca
c83537a6a9 Sink filling typo 
No more filling the the bucket using the sink.
 2014-01-15 19:13:06 +13:00
Loganbacca
e145b61681 Refined earlier fix 
Tried a couple of other solutions, but this ended up being the most reliable.

Now checks all areas associated with the firedoor to see if they should still be down.

Also makes a final check before closing the door in case the fire alarm turns off in the middle of an autoclose cycle.
 2014-01-15 18:18:58 +13:00
Loganbacca
4953608bda Previous fix code cleanup 
Fixes #4295

Todo: investigate sub-areas not inheriting var/fire
 2014-01-14 18:47:29 +13:00
Loganbacca
5827e5a022 Fixes #4296 2014-01-14 15:59:58 +13:00
Loganbacca
c55e71c739 Fixes #4295 
Issue: firedoor not correctly entering alarmed state.

Todo: cleanup fix before PR
 2014-01-14 15:53:24 +13:00
Mloc
57a83eae70 Fix for #4194 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-01-13 14:27:44 +00:00
Mloc
75348f6dca Fix for #4293 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-01-13 14:10:56 +00:00
Ccomp5950
d5bcef4f8a Uplink fix item spawner fix. 
Probably a merge conflict fix or something but some code got moved to an odd spot.
 2014-01-12 22:37:00 -06:00
Chinsky
214e713960 Merge pull request #4284 from Mloc/bs12-cryosleep 
Fix for assistants being unspawnable after one enters a cryopod.
 2014-01-12 16:34:41 -08:00
Mloc
e25c60f930 Fix for #4289 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-01-12 23:23:04 +00:00
Mloc
e826458900 Merge remote-tracking branch 'upstream/master' into dev-freeze 2014-01-12 21:55:11 +00:00
Igor Golubkov
a0b909926b Fix for broken on spawn chem_dispenser 
Remove ~83 minute before RnD chem_dispenser starts recharging.
Fix chem_dispenser logic.

Signed-off-by: Igor Golubkov <bctpe4hbiu@bctpe4hbiu.org>
 2014-01-13 00:25:45 +04:00
Mloc-Argent
0215410e02 Fix for assistants being unspawnable after one enters a cryopod. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-01-12 13:54:32 +00:00
Ccomp5950
dc7e32a646 Merge pull request #4271 from Loganbacca/master 
Plasma glass stacking fix
 2014-01-11 19:39:22 -08:00
Ccomp5950
dfe96b3702 Merge pull request #4260 from Zuhayr/sandwiches 
Sandwiches!
 2014-01-11 19:15:56 -08:00
Chinsky
7a80f02670 Merge pull request #4278 from Faerdan/dev 
SMES NanoUI
 2014-01-11 19:04:18 -08:00
Chinsky
1d6c645bc9 Merge pull request #4279 from Ccomp5950/pda_optimizations 
NanoUI PDA optimizations no more sortAtom every tick on every PDA.
 2014-01-11 18:48:55 -08:00
Ccomp5950
83ef93c41c Merge pull request #4270 from Baystation12/master 
Merge master into Dev
 2014-01-11 18:18:03 -08:00
Ccomp5950
167671d583 NanoUI PDA optimizations no more sortAtom every tick on every PDA. 
Should be noticably better on large population servers.
 2014-01-11 20:09:11 -06:00
Mark Aherne (Faerdan)
1f50cae6c2 SMES NanoUI 
* Converted SMES to NanoUI.
 2014-01-12 01:28:03 +00:00
Mloc
df970c5d2d Merge pull request #4274 from SkyMarshal/airfixes 
Patches some logic holes in ZAS, specifically rebuilding and deletion.
 2014-01-11 11:56:43 -08:00
SkyMarshal
350c1500cf Patches some logic holes in ZAS, specifically rebuilding and deletion. Fixes #4273 2014-01-11 11:34:57 -07:00
Zuhayr
bd28c0c70b Merge pull request #4263 from Furlucis/master 
Talisman icon fix
 2014-01-11 07:54:22 -08:00
Zuhayr
2dd2ce8ed1 Merge pull request #4262 from Ccomp5950/mouse_runtime 
Runtime fix for people that jump back in their body before hitting respawn
 2014-01-11 07:53:51 -08:00
Loganbacca
909928f3f9 Plasma glass stacking fix 2014-01-11 18:14:51 +13:00
Ccomp5950
3d34567d56 Merge pull request #4269 from LightningIron/master 
Bugfixes
 2014-01-10 19:28:23 -08:00
LightningIron
b3bfc9684d Made APC modules cost 50m/50g from autolathe, on par with other engineering modules. 2014-01-10 20:58:20 -06:00
Ccomp5950
cbcd3d1468 Merge pull request #4265 from SkyMarshal/heatfix 
Heatfix
 2014-01-10 18:47:53 -08:00
LightningIron
cbd3f280af Forgot to include the /spray/ part of the chemsprayer path. 2014-01-10 20:43:27 -06:00
LightningIron
5119882536 Fixes #4286. 2014-01-10 20:36:20 -06:00
Zuhayr
adaccb3c3e Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-11 10:45:57 +10:30
SkyMarshal
9cae391e0e Adds developer-level access to ZAS settings. 
Fixes bug which would always let heat move through doors.
 2014-01-10 16:48:16 -07:00
SkyMarshal
ccaef844bf Fixes derpiness with ZAS heat transfer. 2014-01-10 16:40:06 -07:00
SkyMarshal
890491da61 Fixes ZAS silliness with SoftDelete 2014-01-10 16:38:08 -07:00
Furlucis
4340e4a6b5 Talisman icon fix 
Makes talismans keep looking like talismans for more than a tick.
 2014-01-10 17:09:01 -05:00
Ccomp5950
bc6561b9e4 Runtime fix for people that jump back in their body before hitting respawn or just stay in their body for 30 minutes. 
Who does that?  People that cause runtimes, that's who!

(Jerks)
 2014-01-10 15:59:40 -06:00
DJSnapshot
4219b597b6 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/customitems/item_defines.dm
 2014-01-10 13:52:07 -08:00
Mloc
6f01e97161 Merge pull request #4248 from Zuhayr/dev 
Dionaea changes (microwave recipe, holder procs) and resist verb.
 2014-01-10 13:47:46 -08:00
Mloc
efa5a600e3 Merge pull request #4252 from RKF45/ears 
Tiny objects on ears
 2014-01-10 13:47:10 -08:00
DJSnapshot
e524d2112f Merge pull request #4244 from LightningIron/master 
Ninja bugfixes/minor code cleaning/energy cost changes
 2014-01-10 13:42:42 -08:00
DJSnapshot
46c6145cf7 Made it so asay is not the same color as adminlogs. 2014-01-10 13:39:40 -08:00
DJSnapshot
f911f84bbd Replaces modwho and adminwho with staffwho. 
(Also, stealthfix.)
 2014-01-10 12:49:32 -08:00
Mloc-Argent
4c1e17649e Merge remote-tracking branch 'upstream/master' into dev 2014-01-10 20:07:47 +00:00