Zuhayr
be562e675c
Actually fixes scanners.
2014-12-07 21:29:30 +10:30
Zuhayr
0fe2159f86
Fixes #7092
2014-12-07 21:21:00 +10:30
Zuhayr
35f5bb16c9
Fixes #7188
2014-12-07 21:20:47 +10:30
Zuhayr
e4a332c5b6
Fixes #7262
2014-12-07 21:20:24 +10:30
Zuhayr
a7ce13f49d
Fixes #7223 and #6966 , adds inhand and suit sprites for nymphs.
2014-12-07 20:44:11 +10:30
Zuhayr
117dd18284
Adjusted ninja spawn proc to check rig internals.
2014-12-07 20:13:59 +10:30
Zuhayr
3715dd6817
Shuffling some items around to ensure spawn
2014-12-07 20:01:43 +10:30
Zuhayr
54ba518762
Fixes #7253
2014-12-07 18:51:20 +10:30
Zuhayr
1dc68e22bc
Merge pull request #7258 from Baystation12/master
...
Updating dev-freeze from master.
2014-12-07 11:28:27 +10:30
Segrain
8df3e41788
Fix for #7204 .
2014-12-06 18:08:12 +03:00
Segrain
bb4f81e443
Fix for #7232 .
2014-12-06 18:01:31 +03:00
GinjaNinja32
95c2b09c94
Fix num2hex()'s handling of zero
2014-12-06 02:20:11 +00:00
Zuhayr
ba1f4a8f03
Merge pull request #7248 from Baystation12/master
...
Master into dev.
2014-12-06 12:18:13 +10:30
Chinsky
60fcda13e7
Merge pull request #7241 from GinjaNinja32/slimefix
...
Fixes invisible slimes.
2014-12-06 04:23:43 +03:00
Chinsky
91cbd95838
Merge pull request #7237 from PsiOmegaDelta/PunchTheKeysForGodsSake
...
Fixes #7233 .
2014-12-06 04:23:31 +03:00
Chinsky
92a88b8a23
Merge pull request #7243 from mwerezak/h2h
...
Unarmed attacks
2014-12-06 04:23:23 +03:00
mwerezak
032308fb9d
Fixes #7213 restoring unarmed damage to previous values, adjusts unarmed attack logs.
...
Unarmed attack messages no longer assume every attack verb ends with -ed.
2014-12-05 18:10:39 -05:00
GinjaNinja32
e8eb73a3c4
Fixes invisible slimes
2014-12-05 20:50:33 +00:00
PsiOmega
d400f9d174
Encrpytion!
...
This misspelling was about to drive me insane.
2014-12-05 20:27:28 +01:00
Zuhayr
93805d5742
Merge pull request #7225 from PsiOmegaDelta/SyndiBorg
...
Syndicate borg code refactoring.
2014-12-05 23:37:31 +10:30
PsiOmegaDelta
422ff9b39e
Merge pull request #7236 from mwerezak/ops-docking
...
Remaps the nuke ops shuttle for station docking
2014-12-05 13:57:31 +01:00
Zuhayr
d5c5418384
Merge pull request #7226 from Amunak/chat-shenanigans
...
Minor changes for ghosts, added verb to remain anonymous
2014-12-05 23:26:11 +10:30
PsiOmega
4a0536bca7
Fixes #7233 .
...
Making sure the skills list is always initiated, even when not created as a player mob.
2014-12-05 11:55:16 +01:00
mwerezak
5b1f7695e3
Remaps the nuke ops shuttle for station docking
...
Adjusts the shuttle to incorporate a nice, 2-tile wide docking hatch.
Drops the viro/xenobio docking arm.
Adds a button so that the teleporter blast door can be operated
independently of the airlock blast door.
Fixes some leftover arrivals area just hanging around in space.
Adds a poster specifically for the nuke ops shuttle.
2014-12-05 01:17:17 -05:00
mwerezak
3dc947806f
Cameras now use the broken circuitboard item as well.
2014-12-04 17:16:56 -05:00
mwerezak
89cef05a19
Merge remote-tracking branch 'upstream/dev' into secure-airlock
2014-12-04 17:15:27 -05:00
mwerezak
674817ff0b
The wire datum UI now indicates if the wires have been randomized.
2014-12-04 16:49:18 -05:00
mwerezak
58f227ec69
Cleans up airlock electronics
...
Removes the icon_state hack
Moves airlock electronics creation into it's own proc.
Moved airlock creation from a door assembly to airlock/New()
2014-12-04 16:40:27 -05:00
mwerezak
83a482a548
Makes secure airlock electronics available from the circuit imprinter
2014-12-04 13:28:26 -05:00
PsiOmega
201d2f42a3
Merge remote-tracking branch 'upstream/dev' into Beds
2014-12-04 14:12:54 +01:00
PsiOmegaDelta
68644b0e5e
Merge pull request #7219 from Loganbacca/chairfix
...
Tape and chairs
2014-12-04 14:10:46 +01:00
Amunak
e8c41b38f7
Fixed the message for admins when they use 'ghost'.
...
Just for clarity, because I'm bad at English. Props to Omega for the wording.
2014-12-04 12:58:32 +01:00
PsiOmega
1f9cb08102
Syndicate borg code refactoring.
...
Refactors the borg syndicate code to be more accessible to adminbus.
Syndicate borgs have a jetpack module.
Overrides canUseTopic() to limit what the Syndi-borg can interact.
Still has all access, may be more limited in the future if Bump() is refactored /tg/ style. Admins: Spawn with care.
2014-12-04 12:56:29 +01:00
Amunak
ab01b270a7
Added missing EOL in observer.dm
2014-12-04 11:51:31 +01:00
Amunak
39c6e3e431
Ghosts/observers now have the option to be anonymous in deadchat.
...
It is a ghost-time preference that doesn't get saved. Admins see anonymous ghosts with a * next to their key. People talking in dead bodies are now always seen only with the name of their body (admins see their keys with a ^).
2014-12-04 11:46:31 +01:00
Amunak
9fe0cdac28
Admins will now receive a prompt to use aghost when they use ghost.
...
It replaces the usual prompt that was irrelevant to admins anyway. Adds option for admins to aghost from the ghost prompt.
2014-12-04 11:35:04 +01:00
Loganbacca
c4c90adc8e
Added tape roll
...
- Added 1x tape roll to office supplies pack
2014-12-04 21:54:41 +13:00
mwerezak
77288fb951
Merge remote-tracking branch 'upstream/dev' into camera
...
Conflicts:
code/game/machinery/portable_turret.dm
2014-12-03 23:37:02 -05:00
PsiOmega
806e200857
Merge remote-tracking branch 'upstream/dev' into Beds
2014-12-03 23:03:43 +01:00
Ccomp5950
5fc6518e21
Merge pull request #7217 from mwerezak/syndie-suit
...
Adds mask and oxygen tank to uplink kits that provide space suits.
2014-12-03 17:02:48 -05:00
Ccomp5950
55b66b9039
Merge pull request #7220 from PsiOmegaDelta/DismantleThatWindow
...
Fixes #7214 .
2014-12-03 17:02:29 -05:00
mwerezak
01fbe4b542
Fixes portable turret ex_act()
...
Class 3 is the least severe, not the most.
2014-12-03 10:36:30 -05:00
mwerezak
fad5506683
Cameras can be broken by weapons/projectiles, fixes
...
Fixes being able to show papers to AIs through deactivated cameras.
Fixes being able to break doors with TOX, OXY, and CLONE damage.
Fixes camera alarms persisting after the camera is deleted.
Fixes #7021 .
Some camera cleanup.
2014-12-03 10:36:30 -05:00
PsiOmega
cb4a4d67a1
Merge remote-tracking branch 'upstream/dev' into Turrets
2014-12-03 11:38:54 +01:00
PsiOmega
52346094f8
Fixes #7214 .
...
Dismantling a window should now return an appropriate number of sheets for its type.
2014-12-03 11:06:33 +01:00
PsiOmega
74d9441a1c
Merge remote-tracking branch 'upstream/dev' into Beds
2014-12-03 09:06:34 +01:00
mwerezak
7049156519
Adds mask and oxygen tank to uplink kits that provide space suits.
2014-12-02 22:24:53 -05:00
Ccomp5950
19bbc4a004
Merge pull request #7212 from Loganbacca/ducttape
...
Duct Tape
2014-12-02 20:32:04 -05:00
Ccomp5950
cadfecddce
Merge pull request #7202 from PsiOmegaDelta/PlasticBag
...
Constructable blood packs.
2014-12-02 20:31:12 -05:00
Ccomp5950
25224491ce
Merge pull request #7195 from PsiOmegaDelta/BloodDrive
...
Cargo can now order empty blood packs.
2014-12-02 20:31:04 -05:00
