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
Albert Iordache
4b350214a9
Fixed two runtimes errors (AI eye and artifacts)
2012-07-15 12:50:27 +03:00
Albert Iordache
8b976b3279
Debug message
2012-07-15 12:29:02 +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
d931bb9ad7
Removed X button from PDAs.
2012-07-11 13:18:36 +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
c2c71481e0
Lowered the amount of time for which a RadBelt event lasts, made the crew quarters safe as well and drastically lowered the amount of damage monkeys receive. Safe areas are also revealed to the crew.
...
Feel free to balance afterwards, but I felt this was overall needed, because the events were so dangerous that they were annoying, and AFK people were also affected.
2012-07-10 23:04:21 +03:00
Albert Iordache
a2ef50ed29
Fixed bug where helmet lights would not turn off when placed in backpacks and updated changelog
2012-07-10 22:14:08 +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
