cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,437 Commits 10 Branches 0 Tags
a29e52b10c444bb6602012f64652c7cf3c44d5d5
Commit Graph

6993 Commits

Author SHA1 Message Date
Ccomp5950
dfec09ebb2 Merge pull request #4342 from Zuhayr/ihategit 
Multiz changes.
 2014-01-25 20:24:49 -08:00
Ccomp5950
a3befe9936 Private message fixes. Stealth-mode / admin != maroon 
Stealth-Mode Admins won't have their keys show up in the title of private messages anymore (unless the person sending the message is mod+)

Admins PM's to players will show up as red again.  You are welcome Virgie!
 2014-01-25 22:16:58 -06:00
RKF45
9d24651691 Non-ugly beaker examine 2014-01-25 12:05:16 +01:00
Ccomp5950
14c2e3f612 Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev 2014-01-24 20:38:29 -06:00
Ccomp5950
16904ec5ec Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-01-24 20:38:09 -06:00
Zuhayr
98177f5a33 Compile fix for what I think was a botched merge with Chemistry-Machinery.dm. 2014-01-25 03:18:48 +10:30
Zuhayr
e870d614c2 Mass correction of controler to controller. 2014-01-25 03:15:13 +10:30
Loganbacca
867d0d6967 Areas added to powernets again 
Fixes #4328

New z-level code wasn't handling d1 == 0 cables correctly.
 2014-01-24 17:26:33 +13:00
Chinsky
6da9f68a7a Merge pull request #4329 from Ccomp5950/gun_fixes 
Sniper Rifle fixes
 2014-01-23 09:07:53 -08:00
Ccomp5950
3d44e909bd Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-01-23 01:39:10 -06:00
Ccomp5950
8ae4e41aaa Derp merge deconflict error I made when merging master into dev-freeze. 2014-01-23 01:36:32 -06:00
Ccomp5950
283df26fa7 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-01-23 00:19:01 -06:00
Ccomp5950
c028db481e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2014-01-23 00:05:53 -06:00
Ccomp5950
2d25c94900 Sniper Rifle Zoom proc documentation comments. 2014-01-22 23:46:05 -06:00
Ccomp5950
b260d511fb Gun fixes. 
You die, you are zoomed out

You have welding equipment on, you can't zoom in.
 2014-01-22 23:40:32 -06:00
Ccomp5950
fbcf162416 Sniper Rifle fix. 
You have no HUD when zoomed.  None, I'm unable to move every HUD element while zoomed in so you lose it.  Consider it part of your concentration while zoomed in.

If you move while zoomed in you automatically zoom out, you lose concentration.

If the rifle isn't in your active hand you can't zoom in.
 2014-01-22 22:40:21 -06:00
Ccomp5950
84eefc3b31 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into gun_fixes 2014-01-22 22:39:16 -06:00
Zuhayr
dba1ad0819 Merge pull request #4316 from RKF45/robots 
Fixes for emagging robots
 2014-01-22 01:09:51 -08:00
DJSnapshot
e76838bd6e fix for muting deadme as well. 2014-01-20 22:42:56 -08:00
DJSnapshot
64e3c3d6b9 Admin requested addition of a global dsay toggle. 2014-01-20 18:27:12 -08:00
Furlucis
005d72feb4 Typo fix 
Fixes a reagent recipe.
 2014-01-20 03:20:35 -05:00
Chinsky
3b26dab954 Merge pull request #4309 from LBraindead/dev 
AMEN
 2014-01-19 21:25:19 -08:00
Chinsky
8430e0a720 Merge pull request #4319 from RKF45/colour 
Realistic colour mixing
 2014-01-19 21:23:45 -08:00
Ccomp5950
0870844898 SMES fix, AI's can now use them. 
Thinking this was a typo, though quite honestly I'm not sure why this test
is even here as distance checks are built into nanoUI but since feradan put it in
I'm kinda not wanting to remove it.
 2014-01-19 21:26:15 -06:00
Loganbacca
7f89f602b2 Fixed rad collector toxin drain bug 
Removed bad code modifying variables directly and replaced it with a proc that correctly modifies the gas volume.
 2014-01-20 16:16:02 +13:00
RKF45
d35c9954b6 Rework of colour mixing 2014-01-19 21:47:42 +01:00
RKF45
5a9e8e0f30 Fixes for emagging robots 2014-01-19 12:16:10 +01:00
RKF45
ca4bb831d4 Debug 2014-01-19 12:03:32 +01:00
Chinsky
6175ef8012 Moved cable definition to cable.dm because what the fuck. 2014-01-19 03:05:48 +04:00
Chinsky
669ae9a1ae Made cables use color var instead of separate icons for each color. 
It allows for wires of ANY color (just set cable_coil var)
and most importantly
40 837 958 b - before
39 506 651 b - after
 2014-01-19 03:02:58 +04:00
RKF45
75e66d546a Rework of colour mixing 2014-01-18 21:09:02 +01:00
LBraindead
1f9716d1f2 Update disposal.dm 2014-01-18 01:10:18 +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
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
Furlucis
7dd5968f76 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 2014-01-17 03:05:04 -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
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