cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 13:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,884 Commits 7 Branches 0 Tags
fd7ddfa11aaaeec1fc85028f6a9f599d6377674d
Commit Graph

2653 Commits

Author SHA1 Message Date
SkyMarshal
4fe2b585a7 Adds further checking and variable presets to ZAS, and made the contamination overlay actually work. 2012-07-24 22:12:25 -07:00
SkyMarshal
e859d51601 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-07-24 11:24:08 -07:00
Cael_Aislinn
f250b8de1b added blue tiled floors to medbay lobby, added purple tiles to areas of research and the hallway adjoining research, remapped the anomaly hallway and research dock, remapped the research outpost dock, added todo note for a future cycling airlock update 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-25 02:15:47 +10:00
SkyMarshal
cf2a52a50c Whoops. 2012-07-24 00:43:41 -07:00
SkyMarshal
76f77cb3e9 EXPERIMENTAL CHANGE: Increased heat capacity of normal gases, to make extreme temperatures more dangerous. THIS MAY HAVE UNINTENDED CONSEQUENCES. 2012-07-24 00:38:58 -07:00
SkyMarshal
6412692748 Fixed humans not being affected by temperature. 2012-07-23 23:44:43 -07:00
CIB
95ab92c0a6 Merge pull request #1510 from Abi79/master 
Minor optimization to metroid/proc/get_obstacle_ok
 2012-07-23 23:10:15 -07:00
SkyMarshal
d09d744f7f Made the adminhelps sent to the IRC lack the HTML, and made PLASMAGUARD actually work. 2012-07-23 21:32:35 -07:00
Albert Iordache
4eee0a106c Minor optimization to metroid/proc/get_obstacle_ok() and re-added Sky's beam optimization 2012-07-23 18:43:43 +03:00
Albert Iordache
cfabe7be97 Re-added deletion logging 2012-07-23 10:31:14 +03:00
Albert Iordache
188e7e3a2a Revert "Optimized the code regarding the beam projectiles leaving a fleeting beam behind them, however the count of deletions is still quite high despite this. 30-50 deletions per second." 
This reverts commit 45c8a37bd1.
 2012-07-22 23:35:38 +03:00
SkyMarshal
45c8a37bd1 Optimized the code regarding the beam projectiles leaving a fleeting beam behind them, however the count of deletions is still quite high despite this. 30-50 deletions per second. 
Also fixed the code for evidence bags.
 2012-07-20 22:04:00 -07:00
SkyMarshal
2a1404faac More rigidly defined ZAS zone structures, so that connections work without flaw and rebuilding a zone will always produce the same shape. Also readded spess carp and fixed a compilation error. 2012-07-20 12:35:42 -07:00
CIB
c219463c2c Merge pull request #1499 from Nerezza/istype 
'Streamlining' the istype procs a little.
 2012-07-20 09:43:26 -07:00
CIB
ebc6bf8897 Merge pull request #1500 from Nerezza/oxyreci 
Added Oxycodone recipe
 2012-07-20 09:42:50 -07:00
Nerezza
916b289c83 modified: code/modules/chemical/Chemistry-Recipes.dm 2012-07-20 10:40:05 -05:00
Nerezza
c840fa3698 modified: code/modules/mob/mob_helpers.dm 2012-07-20 08:53:23 -05:00
Albert Iordache
a47109950c Removed null organ debugging (no conclusive results) and broken access changing on airlocks during air alarms 2012-07-20 12:01:02 +03:00
Nerezza
c462364cf6 modified: code/modules/mob/living/silicon/robot/robot_modules.dm 2012-07-17 23:25:32 -05:00
Nerezza
253fe92b1b modified: code/modules/mob/living/silicon/ai/say.dm 
modified:   code/modules/mob/living/silicon/decoy/decoy.dm
	modified:   code/modules/mob/living/silicon/pai/say.dm
	modified:   code/modules/mob/living/silicon/robot/say.dm
	modified:   code/unused/hivebot/mainframe.dm
	modified:   code/unused/hivebot/say.dm
 2012-07-17 14:26:36 -05:00
Nerezza
3ca01536fd modified: code/modules/mob/living/carbon/brain/brain.dm 
modified:   code/modules/mob/living/silicon/ai/say.dm
	modified:   code/modules/mob/living/silicon/decoy/decoy.dm
	modified:   code/modules/mob/living/silicon/pai/say.dm
	modified:   code/modules/mob/living/silicon/robot/say.dm
	modified:   code/unused/hivebot/mainframe.dm
	modified:   code/unused/hivebot/say.dm
 2012-07-17 13:39:45 -05:00
Albert Iordache
6e143ad438 Merge pull request #1481 from Nerezza/patch-2 
Mops need a bucket to use.
 2012-07-17 00:43:15 -07:00
Mloc
abfbf289c2 Merge pull request #1479 from headswe/master 
blood regen fix.
 2012-07-16 11:35:42 -07:00
Nerezza
0587a5a265 Mops need a bucket to use. 2012-07-16 13:26:31 -05:00
Nerezza
7b14336608 The medical borg's hypo looks to be using the icon 'borghypo' from syringes.dmi which doesn't exist. I think this should fix it so medicalborgs have hypos again. 2012-07-16 12:57:35 -05:00
Albert Iordache
246a0cca2a Removed some mob/organs deletions 2012-07-16 17:13:45 +03:00
Head
966c6c079b Fixed blood regen 2012-07-16 12:31:07 +02:00
Albert Iordache
61d851d5b2 Debugging organs 2012-07-16 12:12:48 +03:00
Albert Iordache
4b350214a9 Fixed two runtimes errors (AI eye and artifacts) 2012-07-15 12:50:27 +03:00
Albert Iordache
0762b2a9eb Fixed a case where examine becomes bugged after an admin revives a player 2012-07-14 14:08:17 +03:00
Albert Iordache
b94b57e04c Partially fixed the double definition of BROKEN, renamed organ definitions 2012-07-13 23:42:05 +03:00
Albert Iordache
dd6c41ade1 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	code/modules/research/xenoarchaeology/artifact_effect.dm
 2012-07-13 20:58:48 +03:00
Albert Iordache
dda09390ac Merging pull request from caelaislinn-master 2012-07-13 20:54:22 +03:00
Albert Iordache
b4c7e25d94 Merge pull request #1469 from Abi79/bugfix 
Quick fix to avoid artifact runtime error spam
 2012-07-13 02:48:21 -07:00
Albert Iordache
05851aa0e4 Quick fix to avoid artifact runtime error spam 2012-07-12 15:57:53 +03:00
Albert Iordache
aab476a847 Optimized the mineral processing machine a bit 2012-07-12 15:40:13 +03:00
Albert Iordache
ff91b3d499 Added a limit of ore to the ore boxes and lowered the limit of ore for satchels 2012-07-12 15:38:53 +03:00
Albert Iordache
f5fff3d937 Re-added the limit of 10 items moved per tick, for conveyor belts 2012-07-12 15:37:22 +03:00
Albert Iordache
3059f37f9a As in human/life(), made metroid/Life() abort if stat == 2 2012-07-11 11:33:43 +03:00
Albert Iordache
f7c41f6b42 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-07-10 22:06:11 +03:00
Albert Iordache
d47b71b7c8 Added cancel button to teleport dialog, close button to PDA window and cancel button to telepathic mind projection 2012-07-10 16:31:19 +03:00
CIB
f083c109bf Fix issue #1449 2012-07-10 13:09:15 +03:00
Albert Iordache
1e468ba4f6 Fixed the "do/does" examine bug for humans 2012-07-10 12:00:40 +03:00
CIB
d2a23a6afc Fixed issue #1456 2012-07-10 10:53:02 +03:00
Albert Iordache
1faea6c508 Removed the artifact stun effect 2012-07-10 09:37:59 +03:00
CIB
d5f633a79a Radiation protection was unbalanced: A full rad suit would only give 15% protection 2012-07-09 21:30:35 +03:00
SkyMarshal
376706aecd Merge pull request #1457 from CIB/master 
Admins will now be notified if a reported player logs in.
 2012-07-08 12:15:19 -07:00
cib
0bd54bd612 Admins will now be notified if a reported player logs in. 2012-07-08 20:16:18 +02:00
caelaislinn
bfa9fed862 new chemistry reagent and recipe used with xenoarch 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-07-09 01:06:10 +10:00
caelaislinn
4e5a44864b Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-08 23:10:29 +10:00