cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,749 Commits 6 Branches 0 Tags
f250b8de1b29a860f34b58ec46c88284c541a015
Commit Graph

5055 Commits

Author SHA1 Message Date
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
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
1b55d837e1 Updated atom deletion logs to also display the type of the atom 2012-07-23 11:32:23 +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
Albert Iordache
ac4b8d076a Minor zone/proc/Rebuild() optimization 2012-07-22 14:37:57 +03:00
Albert Iordache
b42b853d7e Merge branch 'master' of https://github.com/caelaislinn/Baystation12 into caelaislinn-master 
Conflicts:
	code/ZAS/Plasma.dm
 2012-07-21 14:04:26 +03:00
Albert Iordache
3091d13d5d Merge pull request #1507 from CIB/HoS 
HoS now can't start out as cultist, but should still be convertible.
 2012-07-21 03:58:57 -07:00
Cael_Aislinn
4f3374cdaf compile fix 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-21 20:54:31 +10:00
Cael_Aislinn
779ca913f4 death alarm implants no longer announce deaths on syndicate shuttles 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-21 20:51:11 +10:00
Cael_Aislinn
cf0752422f syndicate station is perma-lit again 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-21 20:41:17 +10:00
Cael_Aislinn
1f3540f0d3 various mapfixes, including misnamed camera networks ("Dormitoy"), camera network tweaks (prison wing, mainly) and missed camera networks (theatre) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-21 20:08:30 +10:00
Cael_Aislinn
84a80fe120 removed extra var definition 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-21 19:38:24 +10:00
cib
62edde053d HoS now can't start out as cultist, but should still be convertible. 2012-07-21 11:16:27 +02: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
e14aaac99a Fix for compile error. 2012-07-20 19:16:26 -07:00
SkyMarshal
6dadde18c3 Improved ZAS plasma setting names and feedback when it is changed. 2012-07-20 13:45:51 -07:00
SkyMarshal
10a283b681 Fixed an ooops 2012-07-20 12:39:53 -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
CIB
d851d954df Made the check for entering mech's a little easier to read. 2012-07-20 16:34:45 +03:00
StrumpetPlaya
195ad346ff Another bugfix for atmos lockdowns. 
- Doors that are locked down by two different alarms should no longer
  have their access permanently require engineering access.
 2012-07-20 08:42:29 -04:00
StrumpetPlaya
4dc1379a20 Re-added atmos lockdowns and fixed two bugs with them. 
- Doors that are open when a lockdown occurs should no longer have their
  access permanently require engineering access.
- Doors that are open when a lockdown is cancelled should no longer be
  stuck in a lockdown state.
Still known bug - Doors that are locked down by two different alarms will
lose lockdown status if only one of the alarms is cancelled.
 2012-07-20 08:13:02 -04: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
CIB
a180a727d6 Merge pull request #1495 from Nerezza/mecha-patch3 
Fixed humans not being able to enter mechs.
 2012-07-18 09:27:31 -07:00
Albert Iordache
c51d632a0b Attempted a fix for airlocks not unlocking after switch to green air alarm 2012-07-18 18:10:53 +03:00
Nerezza
2441ce0e85 modified: code/game/mecha/mecha.dm 2012-07-18 03:12:52 -05:00
Nerezza
c462364cf6 modified: code/modules/mob/living/silicon/robot/robot_modules.dm 2012-07-17 23:25:32 -05:00
Albert Iordache
1365a009d1 Merge pull request #1488 from Nerezza/Tara-fix2 
What's worse to work with?
 2012-07-17 13:49:34 -07:00
Nerezza
6a4510cd7d modified: code/WorkInProgress/Cael_Aislinn/Tajara/say.dm 2012-07-17 15:10:57 -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
2023ecae52 Update Tara-patch1 2012-07-17 13:46:55 -05:00
Nerezza
d9d6903446 Update Tara-patch1 2012-07-17 13:43:18 -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
Nerezza
329e728808 Commit to Mecha-patch 2012-07-17 12:09:53 -05:00
Albert Iordache
8987972472 Update master 2012-07-17 10:49:38 +03:00
Albert Iordache
04f8ac6b0a Merge pull request #1482 from Nerezza/patch-3 
Mechas now take Tajaran pilots.
 2012-07-17 00:47:26 -07: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
Nerezza
4d3d05fc7a Mechas now take Tajaran pilots. 2012-07-16 23:37:57 -05: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