Commit Graph

11085 Commits

Author SHA1 Message Date
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
GinjaNinja32
631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01: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
mwerezak
cb2a094553 Adds fragmentation grenades
Adds a fragmentation grenade item that launches a shower of projectiles
in all directions when detonated.
2015-08-11 02:42:25 -04:00
PsiOmegaDelta
4bb6749f24 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-11 08:34:46 +02: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
Hubblenaut
3fb52ab4d5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
2015-08-11 00:51:18 +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
570806046b Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/custom_sprites.dm
	code/modules/organs/organ_stump.dm
	code/setup.dm
2015-08-10 17:56:14 +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
Kelenius
7562f6f01a Updates mechfab interface
Fixes all bugs I found.
2015-08-10 17:46:03 +03: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
Kelenius
dabcccca6b Updates mechfab UI 2015-08-09 20:45:39 +03:00
Mark9013100
65089c44b7 Adds a box for fingerprint cards 2015-08-09 11:36:57 -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
PsiOmega
889f399356 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/area/areas.dm
	code/game/machinery/alarm.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/reagents/Chemistry-Machinery.dm
2015-08-09 13:15:22 +02:00
PsiOmega
6a15611711 Explosion particle GC.
Explosion particles cheated, only nulling the location and hoping to get collected one day.
2015-08-09 12:35:07 +02:00
PsiOmegaDelta
31b8335298 Merge pull request #10456 from mwerezak/air-alarm
Fixes
2015-08-09 10:09:02 +02:00
Neerti
f407f9aa22 Merge pull request #137 from Woodratt/Woodrat_Work_7.8
Woodrat Work 7.8 "Tiny mini skirt edition"
2015-08-09 02:29:38 -04:00
Woodrat
b8c0c5ca5d Woodrat Work 7.8 "Tiny mini skirt edition"
- Added jumpskirts to their department lockers.
- Fixed minor code issue with the QM skirt
- Single scientist wardrobe added to research rest room
- Removed robust cola machine from gateway, added laptop vendor in its stead.
- Two universal recorders added to the main map. Captain's office and art storage.
- Adjusted and added cameras to the doc area to improve coverage.
- Adjusted cameras in primary hallway leading to the dock for coverage purposes.
- Added newscaster to central park.
- Finalized work on the large dorms/visitor housing.
- Added CM sprite for frag grenades for our grenades, also lessened the size of the explosion to (-1,-1,3) from (-1, -1, 4) in a vain attempt to make the blast radius smaller. They shouldn't be too much weaker but...
- Sprite for a box of frag grenades added, box of 7 frag grenades also added to code.
- Two merc op TTVs removed, one left behind. One box of frags and 6 blocks of c4 added to merc op shuttle in their stead.
- One box of frag grenades added to ERT armory.
2015-08-08 23:18:39 -07:00
mwerezak
83abfcf7af Fixes #9594
Areas now initialize to having all power channels off.
2015-08-09 00:02:50 -04:00
mwerezak
1486876e73 Fixes #10449
Reimpements trace gas checking for air alarms. Removes duplicate danger level checking in air alarm nanoui code, as all of that is already calculated as part of air alarm processing.
2015-08-08 23:59:38 -04:00
mwerezak
11d959e767 Adds client image based t-scanner
Replaces the t_scanner implementation with one that sends overlays to the client holding the t-ray item. Fixes #9437
2015-08-08 22:26:38 -04:00
Mark9013100
1b014ef703 Minor ERT/Central changes 2015-08-08 14:21:00 -04:00
mwerezak
d9ee308dbe Merge pull request #10450 from GinjaNinja32/syndicate-beacon
Fix inverted arguments in syndicate beacon self-destruct
2015-08-08 10:59:15 -04:00
PsiOmega
e875a7ce48 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/computer3/buildandrepair.dm
	code/game/objects/items/devices/lightreplacer.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
2015-08-08 15:34:51 +02:00
Mark9013100
b601310f9b Men in black 2015-08-08 06:01:35 -04:00
PsiOmegaDelta
c560bd8d79 Merge pull request #10404 from mwerezak/stack-fix
Material stack related fixes
2015-08-08 09:56:25 +02:00
Neerti
5bd11514f1 Merge pull request #133 from Neerti/8/7/2015_frag_grenades_from_space_nam
Adds frag grenades.
2015-08-08 01:09:07 -04:00