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

6854 Commits

Author SHA1 Message Date
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
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
5827e5a022 Fixes #4296 2014-01-14 15:59:58 +13: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
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
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
Ccomp5950
83ef93c41c Merge pull request #4270 from Baystation12/master 
Merge master into Dev
 2014-01-11 18:18:03 -08:00
Mark Aherne (Faerdan)
1f50cae6c2 SMES NanoUI 
* Converted SMES to NanoUI.
 2014-01-12 01:28:03 +00:00
RKF45
8b384b0668 Various 2014-01-11 22:22:24 +01:00
RKF45
98834ea3cb The costume crate has more than one suit 2014-01-11 22:20:50 +01:00
RKF45
ab8763378b Paint mixing 2014-01-11 22:19:02 +01: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
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
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
Chinsky
76dc0c4c49 Merge pull request #4234 from Mloc/bs12-quicklist 
[TG] Optimized and refactored list2text, text2list, and replacetext.
 2014-01-10 11:55:33 -08:00
Zuhayr
5cddea72f0 Colour fix for bread slices. 2014-01-11 02:50:49 +10:30
Zuhayr
212eed7e1c Icon fixes, shards hidden in food will now lacerate random body parts because damage code is weird. Stop eating chocolate cake sandwich with your left food. 2014-01-11 02:47:12 +10:30
Zuhayr
16a28b7338 Added filling_color var to food items for use in sandwiches. 2014-01-11 02:35:10 +10:30
Zuhayr
38f47f5ae1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-01-10 21:27:15 +10:30
Zuhayr
65e6a79946 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-10 21:26:47 +10:30