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
16,064 Commits 8 Branches 0 Tags
f1b77d0ed67cbc5097f0b51fee94b7f0538ebfd9
Commit Graph

11966 Commits

Author SHA1 Message Date
LBraindead
b7c502152c Update Movement.dm 
jetpack movement
 2014-01-18 00:36:14 +01:00
LBraindead
d106e70b02 Create controler.dm 
z-level controler
 2014-01-18 00:35:36 +01:00
LBraindead
bbe01a80e6 Update explosion.dm 
transfer explosions accross z-levels
 2014-01-18 00:33:41 +01:00
LBraindead
3879477151 Update disposal-construction.dm 
new pipe construction
 2014-01-18 00:32:06 +01:00
LBraindead
f3240073dc Update disposal.dm 
new disposal pipes
 2014-01-18 00:31:27 +01:00
LBraindead
8592fdb953 Update pipe_dispenser.dm 
dispensing new pipes
 2014-01-18 00:30:06 +01:00
LBraindead
f653216cde Update construction.dm 
dispensing new pipes
 2014-01-18 00:29:18 +01:00
LBraindead
ca2de46bc8 Update turf.dm 
preventing space being made and immediately changed to open space
 2014-01-18 00:28:20 +01:00
LBraindead
4bccee98ba Update power.dm 
powernet connection for z-levels
 2014-01-18 00:20:22 +01:00
LBraindead
cfcb3e65cd Update cable.dm 
cable construction
 2014-01-18 00:19:08 +01:00
LBraindead
9d618b2a11 Update lattice.dm 
allow lattices to exist on open space
 2014-01-18 00:16:14 +01:00
LBraindead
f58487a0e9 Update ZAS_Zones.dm 
ZAS adjustments
 2014-01-18 00:14:01 +01:00
LBraindead
d1874bec2e Update Functions.dm 
ZAS adjustments
 2014-01-18 00:10:39 +01:00
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
Furlucis
7dd5968f76 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-17 03:05:04 -05:00
Furlucis
88181a8057 Tweaks homunculi 
Makes them a bit creepier, and makes it so they don't spawn with
underwear. Because really, if the rune spawns anything, it should be
robes. But that would make things too easy.
 2014-01-17 03:00:32 -05:00
Furlucis
5268e4f299 Removes the second holywater 
Deletes the second kind of holy water that doesn't do anything. Lemme
know if I should do the opposite of this.
 2014-01-17 02:57:47 -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
1f7cbfbff4 Supermatter update. 
Now gives an instability% warning in it's messages.

Limited the "If they can see it and aren't wearing mesons, have some hallucinations" range to a max of 7

Can't be pelted with lasers while out in space allowing for unlimited power only to drag it back on a turf and instantly explode.

Removed extra if(!removed) check, we already checked for that above.

Moved the oxygen ratio variable "oxygen" to be declared under the object instead of it's process proc for easier debugging.

Changed the alert interval.

Add luminosity value so the big glowing shard of supermatter actually generates light.
 2014-01-15 20:22:50 -06:00
Ccomp5950
171e63a66f Moved Supermatter.dm out of the WorkInProgress directory. 2014-01-15 17:33:13 -06:00
Ccomp5950
8a179a8ff1 Merge pull request #4299 from Faerdan/dev 
Canister, Tank & Tank Transfer Value NanoUIs.
 2014-01-15 15:21:47 -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
dd7fef9dc2 Merge pull request #4277 from RKF45/paint 
BS12 posters
 2014-01-15 14:02:47 -08:00
RKF45
30f2d49f01 Quotes inside strings confuse and scare me. 2014-01-15 22:45:10 +01: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
Mark Aherne (Faerdan)
024a0baa49 Canister, Tank & Tank Transfer Value NanoUIs. 
* Added Canister, Tank & Tank Transfer Value NanoUIs.
 2014-01-15 01:08:45 +00: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
RKF45
5083e1cd47 Requested adjustments 2014-01-13 22:54:47 +01:00
RKF45
0a4a7c7c08 Merge remote-tracking branch 'upstream/dev' into paintmixing 2014-01-13 22:15:33 +01: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
Chinsky
cb72e02f23 Merge pull request #4285 from Faerdan/dev 
NanoUI assets are now sent to the client automatically.
 2014-01-12 16:34:10 -08:00
Mloc
e25c60f930 Fix for #4289 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-01-12 23:23:04 +00:00
Mark Aherne (Faerdan)
87c246ff06 APC NanoUI 
* Created new APC UI
* Tweaked Chem Master UI width.
 2014-01-12 23:11:49 +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
Mark Aherne (Faerdan)
c9191faa14 NanoUI Caching and SMES tweaks 
* Made NanoUI caching code neater, added check for directories (which are ignored).
* Moved SET to between MIN and MAX on SMES UI.
 2014-01-12 20:07:48 +00:00
Mloc
c46d872e6c Merge remote-tracking branch 'upstream/master' into dev 2014-01-12 19:46:31 +00:00
Mark Aherne (Faerdan)
214fbeee99 NanoUI assets are now sent to the client automatically. 
* NanoUI now finds and sends it's assets to the client (css, images, javascript and templates).

Part of my effort to make creating NanoUIs as simple as possible. This removes the need to add new NanoUI assets (such as templates) to the client send_resources proc.
 2014-01-12 15:30:25 +00: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
RKF45
b9c747aeaf Makes mixing paints actually make sense 2014-01-12 12:04:18 +01:00