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
958eb62ed5
Refactors a lot of reused/redundant death code, fixes #7224
2014-12-07 17:18:56 +10:30
mwerezak
3002de4b50
Fixes atoms with no flags being walkable
...
Fixes atoms that have no flags set allowing movement into them
regardless of CanPass().
2014-12-07 00:59:07 -05:00
Atlantiscze
bf213e6889
Resolves compilation errors caused by previous merge
2014-12-07 04:43:00 +01:00
Atlantiscze
3815ac146f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into pewPEWPEWboom
...
Attempt to resolve merge conflict.
2014-12-07 04:33:46 +01:00
Zuhayr
2b525372f1
Fixes #7238
2014-12-07 11:52:29 +10:30
Zuhayr
2d7ea3028f
Merge pull request #7257 from Baystation12/master
...
Updating dev from master.
2014-12-07 11:28:29 +10:30
Zuhayr
1dc68e22bc
Merge pull request #7258 from Baystation12/master
...
Updating dev-freeze from master.
2014-12-07 11:28:27 +10:30
mwerezak
4582b2892a
HTML formatting
...
Also removes redundant holotable grab handling.
2014-12-06 18:20:40 -05:00
mwerezak
550e5f63ea
Makes forced launch handled by shuttle/process()
...
Forced launches are now run by the shuttle controller through process()
instead of in a separate 'thread' launched from the ui.
2014-12-06 18:07:21 -05:00
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
PsiOmegaDelta
5aa90044d4
Merge pull request #7249 from mwerezak/atmos-tower
...
Atmos tower, Nuke prison, talismans, engine
2014-12-06 10:25:24 +01:00
Loganbacca
b3e0cc98cd
Implantcase cleanup
...
- Removed unnecessary icon definitions
- Cleaned up name formatting
- Removed colons
- Added variants for existing implants
2014-12-06 16:20:16 +13:00
Loganbacca
ad6828e70a
Update implantcase.dm to absolute paths
2014-12-06 16:17:07 +13:00
mwerezak
51bbd6e0da
Merge remote-tracking branch 'upstream/dev' into holospace
2014-12-05 21:29:50 -05:00
mwerezak
44f2891966
Emagged holodeck consoles stay that way.
...
Separates emagged state and holodeck safety state, prevents silicons from re-enabling safeties if someone has emagged the console.
2014-12-05 21:28:29 -05:00
GinjaNinja32
95c2b09c94
Fix num2hex()'s handling of zero
2014-12-06 02:20:11 +00:00
mwerezak
f752ce2a49
Adds image for cult talismans
...
So they aren't blank when examined.
2014-12-05 20:56:07 -05: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
GinjaNinja32
a4f1c617b8
Allow typing all arguments to adminhelp
2014-12-05 17:06:16 +00: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
mwerezak
99910686ad
Holocarp can spawn in the space scenery with a small probability.
2014-12-04 10:03:35 -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
Loganbacca
18cc00b5c0
Research object update
...
- Updates research testing object to include phoron and engineering tech
2014-12-04 20:49:43 +13:00
