Commit Graph

16446 Commits

Author SHA1 Message Date
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
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
25224491ce Merge pull request #7195 from PsiOmegaDelta/BloodDrive
Cargo can now order empty blood packs.
2014-12-02 20:31:04 -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
Snapshot
378936c1a3 Merge pull request #7211 from Loganbacca/rigui
Hardsuit NanoUI rewrite
2014-12-02 17:14:46 -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
Loganbacca
3988b96459 Rig activate message fix
Electrowarfare and power sink modules weren't displaying the correct activate string message. Fixed both.
2014-12-02 22:24:00 +13:00
Loganbacca
9fb58d8568 Third rig UI pass
- Resized the initial ui window again
- Rewrote the modules section to a horizontal layout
2014-12-02 22:23:59 +13:00
Loganbacca
0f2b0b79bd Initial rig ui pass
- Narrowed UI window, we shouldn't need it this wide once I'm done
- Started converting html template to divs for easier formatting
2014-12-02 22:23:59 +13:00
PsiOmegaDelta
529a610613 Merge pull request #7197 from Amunak/patch-1
Supermatter and SMES coil supply pack price changes
2014-12-02 07:21:40 +01:00
PsiOmegaDelta
b05c966b64 Merge pull request #7198 from atlantiscze/interactions
(mostly) silicon adjustments/features
2014-12-02 07:20:58 +01:00
PsiOmegaDelta
d6ea2b887a Merge pull request #7201 from SparklySheep/patch-9
Adds pAI cards to the loadout.
2014-12-02 07:20:50 +01:00
Zuhayr
8e2b0978a8 Fixes #7209 2014-12-02 11:26:44 +10:30
PsiOmega
c936e2bb4f Bed and mercenary shuttle refactoring.
Re-arranges the dormitory bedrooms again. Slightly fewer beds, slightly more maintenance.
Re-shapes the mercenary shuttle airlock and docking points to restore the cabin compartment shape.
Gives the xeno/viro some raison d'être until a something more can be done about it.
2014-12-01 22:31:31 +01:00
Zuhayr
17f32c3ab3 Replacing a loop with the older code. 2014-12-02 02:58:26 +10:30