Commit Graph

10175 Commits

Author SHA1 Message Date
mwerezak
4b21f5f8ad Fixes pipes disappearing when wrenching fails 2015-08-15 15:46:52 -04:00
Kelenius
24fb46f1a9 Fixes #9332 2015-08-15 13:05:49 +03:00
Null Snapshot
0255b79114 Fixes a problem with crates containing animals not spitting out their mobs. 2015-08-14 22:47:53 -07:00
Snapshot
5f5671d21f Merge pull request #10647 from mwerezak/acids
Fixes #10645
2015-08-14 22:22:41 -07:00
mwerezak
133bc96344 Fixes #10645
Sets unacidable where appropriate.
2015-08-14 23:20:10 -04:00
GinjaNinja32
88433b6b98 Merge pull request #10641 from atlantiscze/kill-all-humans
Newmalf Fixes
2015-08-15 03:36:35 +01:00
Atlantis
e7adce2163 Better feedback
- Attempting to hack already hacked APC now correctly produces "You already control this APC" message.
2015-08-14 22:51:59 +02:00
mwerezak
1f7497063a Merge pull request #10618 from GinjaNinja32/10617
fix #10617
2015-08-13 16:20:32 -04:00
GinjaNinja32
1d3a2c1a31 fix #10617 2015-08-13 21:01:46 +01:00
mwerezak
c4ed6a10aa Merge pull request #10609 from PsiOmegaDelta/150813-ReagentQdel
qdel(reagent) adjustments.
2015-08-13 12:35:08 -04:00
Zuhayr
84678a91c1 Fixes roundend failing to scroll, fixes teams not getting shared global objectives. 2015-08-14 00:18:41 +09:30
PsiOmegaDelta
d1e8f670b2 qdel(reagent) adjustments.
Attempts to ensure qdel(reagents) only occur once per Destroy()
2015-08-13 10:26:31 +02:00
Chinsky
6d4699fa32 Merge pull request #10590 from GinjaNinja32/debug
more debug stuff
2015-08-13 05:22:45 +03:00
GinjaNinja32
8d57f25fd5 Add a runtime-generating call to the "object was deleted via del() rather than qdel()" log, so we can get a stack trace from it 2015-08-13 01:51:40 +01:00
Atlantis
f41387a57f Communications emergency-fix
- Comments out buggy code that caused some telecommunication machines to introduce insane delay (up to 30s)
2015-08-13 00:07:32 +02:00
GinjaNinja32
792d6e2864 Merge pull request #10579 from mwerezak/misc
Fixes
2015-08-12 22:21:34 +01:00
HarpyEagle
19fbc71249 Removes req_amount from stack_recipe_list
The stack_recipe_list datum itself is not used to make anything, so having
a req_amount made little sense. Fixes #10572.
2015-08-12 15:54:16 -04:00
Chinsky
0e52b3d4df Merge pull request #10562 from PsiOmegaDelta/150812-OneCrew
Fixes the One Crew Member module.
2015-08-12 20:38:52 +03:00
Chinsky
e562affd13 Merge pull request #10551 from PsiOmegaDelta/150812-RuntimeFixes
Runtime fixes.
2015-08-12 20:38:20 +03:00
HarpyEagle
a62edc5b3a Fixes #10548 2015-08-12 12:21:28 -04:00
PsiOmegaDelta
249db0b03d Fixes the One Crew Member module.
Didn't return properly in install().
Override transmitInstructions() when addAdditionalLaws() was more than sufficient.
2015-08-12 14:42:52 +02:00
PsiOmegaDelta
3e4ec4d7b7 NanoUI windows now close on Destroy(), preventing all sorts of qdel issues. 2015-08-12 09:41:22 +02:00
PsiOmegaDelta
93e666e67c Adds a missing not-null check that is made in another case. 2015-08-12 09:22:46 +02:00
PsiOmegaDelta
32338716bf Re-adds missing bot check.
Not all bots are of the type /mob/living/bot yet. Re-adds the /obj/machinery/bot-type check on airlock bump.
Fixes #10507.
2015-08-12 08:28:39 +02:00
GinjaNinja32
8915edcce2 Merge pull request #10537 from mwerezak/mapping-fixes
Fixes and mapping
2015-08-12 06:39:30 +01:00
mwerezak
a90e1f3f7e Fixes #10501
Also future proofs spaceheaters
2015-08-12 01:16:08 -04:00
GinjaNinja32
5a1c80d843 Fix for non-ANTAG_OVERRIDE_JOB antags breaking with malf fix 2015-08-12 05:06:18 +01:00
GinjaNinja32
54930b69b4 Malfunction 2015-08-12 04:41:59 +01:00
PsiOmega
e4f6436a85 Fixes #10494.
Borgs have their very own custom little headset, so cute.
2015-08-11 21:11:16 +02:00
Chinsky
7b1656f40c Merge pull request #10470 from Karolis2011/dev-freeze
[Dev-Freeze] Replace \red with <span> in runes.dm, fix many "his/her/their" gender messages
2015-08-11 20:07:06 +03:00
mwerezak
8064a76f39 Merge pull request #10484 from atlantiscze/laptop-quickfix
Fixes #10136
2015-08-11 13:06:32 -04:00
Chinsky
4c628ff2c5 Merge pull request #10483 from PsiOmegaDelta/150811-AntagName
Fixes #10468 and #10467
2015-08-11 19:39:15 +03:00
Zuhayr
7bd301161f Merge pull request #9988 from PsiOmegaDelta/150702-SpellFixes
Magical fixes.
2015-08-12 01:54:31 +09:30
Atlantis
d63d2817a1 Fixes #10136
- Quick fix for #10136, laptops now use the #define-d values rather than hardcoded strings. Camera net keys work again properly.
- I also adjusted laptop's power usage. With how it used to be, you could buy laptop and let it run for whole shift, never having to recharge even with weakest cell. Right now, it lasts about 10 minutes on worst cell, and almost one hour on the best one. Actual power usage (in watts) is slightly lower than stationbound consoles.
2015-08-11 12:42:26 +02:00
SomeoneElse
8c0984d5b1 Fix gender issues, some typos from various files 2015-08-11 13:41:40 +03:00
PsiOmegaDelta
54162f1c7d Merge remote-tracking branch 'upstream/dev-freeze' into 150702-SpellFixes 2015-08-11 12:20:54 +02:00
PsiOmegaDelta
f85e9146ab Fixes #10468. Fixes #10467.
Updates the DNA name as well, upon antag name change.
2015-08-11 12:11:32 +02:00
Kelenius
1324e69a19 Fixes #10466 - chem implant can't be loaded
What the literal shit.
2015-08-11 10:26:22 +03:00
PsiOmegaDelta
e1aff6a668 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/machinery/doors/door.dm
	code/game/machinery/portable_turret.dm
2015-08-11 08:21:06 +02:00
PsiOmegaDelta
ef9ebdc741 Merge pull request #10476 from atlantiscze/emp-fix
Fixes #10446
2015-08-10 23:09:35 +02:00
Atlantis
dd79e0f481 Fixes lengthy emp_act() for turret controllers and doors.
- Turret controllers were the same as turrets. Now completely fixes #10446
- Doors also had 10ds sleep() in them, hidden under small probability roll. Fixed.
2015-08-10 23:04:37 +02:00
Atlantis
40cb786986 Adds EMP monitoring for future EMP debugging
- Adds possibility to enable EMP debugging, that monitors how long emp_act() took on object. If it took too long (configurable) it generates a message. It is disabled by default due to possible performance loss with large EMPs.
2015-08-10 22:58:33 +02:00
Atlantis
7297535750 Fixes mistake in turret code
- Turrets no longer freeze any EMP that hits them for 6-60 seconds.
2015-08-10 22:39:22 +02:00
Atlantis
d3dbf3c199 Adjusts names of two areas
- Messaging Server Room -> Research Server Room - That's the server room near toxins storage/misc. research. It has absolutely nothing to do with messaging, as it houses Research's servers only.
- AI Server Room -> Messaging Server Room - That's the actual server room that houses messaging server in central section of the station.
2015-08-10 21:39:35 +02:00
PsiOmega
fb6ab23189 Makes the new initialization message use the proper method. 2015-08-10 17:46:38 +02:00
PsiOmega
a710e77d46 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/controllers/master_controller.dm
	code/game/area/areas.dm
2015-08-10 17:42:40 +02:00
SomeoneElse
64c59d3145 replace \red usages with various <span> usages in runes.dm
code/game/gamemodes/cult/rules.dm:
	replaced {\red,\b} with <span class='{danger,warning,cult}'>.
	added some span class guidelines esp. on cult for future consistency.
2015-08-10 12:58:37 +03:00
mwerezak
12549b7e93 Fixes area power initialization
Power channels start on when objects initialize, then are turned off and area machines notified in area initialization if an apc is not found.
2015-08-09 19:58:37 -04:00
mwerezak
15cbd0e0a2 Merge pull request #10461 from PsiOmegaDelta/150809-ExplosionGarbage
Explosion particle GC.
2015-08-09 09:36:54 -04:00
PsiOmega
d1a4f4b0a4 Compilation fixes and partial revert of #10456. 2015-08-09 13:27:59 +02:00