Zuhayr
b30be0a352
Fixes #7199
2014-12-07 22:13:31 +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
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
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
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
mwerezak
f752ce2a49
Adds image for cult talismans
...
So they aren't blank when examined.
2014-12-05 20:56:07 -05: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
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
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
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
Loganbacca
fd53575658
Implant cases
...
- Adds freedom implant in glass case variant
- Changes implants created from protolathe to variants in glass cases
2014-12-04 20:48:45 +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
63aa4b1a4e
Holodeck computer uses more power when active and turns off if power is lost.
...
Allows players to float when using the 'Space' holodeck scenery.
Fixes holodeck deleting space carp when the scenery is changed.
Holocarp start docile and cannot leave the holodeck unless the conole is emagged.
2014-12-03 15:04:59 -05:00
mwerezak
6a2ceeb4af
Allows floating in the space holodeck scene
2014-12-03 12:55:51 -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
f1c77dcb16
Merge pull request #7190 from PsiOmegaDelta/Topic
...
Fixes exploit that lets AIs use machinery even after cameras are disabled.
2014-12-02 20:29:47 -05:00
Snapshot
867e69c770
Merge pull request #7210 from Zuhayr/dev
...
Fixes #7209
2014-12-02 17:23:19 -08:00
PsiOmegaDelta
4582c0038b
Merge pull request #7205 from Mloc/bs12-setdir
...
refactor 'dir = ' into 'set_dir()'
2014-12-02 14:38:31 +01:00
Loganbacca
c5833dfb9a
Allow reading of taped paper via examine
2014-12-03 00:02:47 +13:00
Loganbacca
76d87e7c84
Tape fixes
...
- Shrunk tape roll sprite
- Disabled tearing off individual strips of tape until they have a use
- Fixed a runtime when removing tape with nothing stuck to it
2014-12-02 23:45:33 +13:00
Loganbacca
26d428e659
Reverted wall repairing with tape
2014-12-02 23:17:46 +13:00
Loganbacca
224b2f3899
Duct Tape
...
First pass for adding duct tape.
It can stick paper to things.
It can patch up walls (crudely).
Coder sprites!
2014-12-02 23:17:45 +13:00
PsiOmegaDelta
b05c966b64
Merge pull request #7198 from atlantiscze/interactions
...
(mostly) silicon adjustments/features
2014-12-02 07:20:58 +01:00
Zuhayr
8e2b0978a8
Fixes #7209
2014-12-02 11:26:44 +10:30
