Commit Graph

13082 Commits

Author SHA1 Message Date
Jarcolr
5966d90f33 Adds mewth's blood red pendant
/obj/item/clothing/tie/fluff/radi
http://baystation12.net/forums/viewtopic.php?f=33&t=10333
2014-06-07 11:26:59 +03:00
Jarcolr
2d51c24364 Adds 2 approved custom items to code
http://baystation12.net/forums/viewtopic.php?f=33&t=10561
http://baystation12.net/forums/viewtopic.php?f=33&t=10517
/obj/item/weapon/lighter/zippo/fluff/janis_godmanis
/obj/item/clothing/ears/fluff/qokkri
2014-06-07 10:46:11 +03:00
Zuhayr
9418a6e2e2 Merge pull request #5162 from mwerezak/wheelchair
Wheelchairs
2014-06-07 13:36:30 +09:30
mwerezak
9c6cd39b9c Fixes compile error 2014-06-05 23:05:35 -04:00
Hubblenaut
a80f2b12e6 Movement with wheelchair not possible in space 2014-06-05 22:51:37 -04:00
Hubblenaut
1e09995f63 Wheelchairs spawn on footless characters 2014-06-05 22:50:42 -04:00
Hubblenaut
3c1d0a83bf Fixes. Wheelchair is supposed to help the occupant and not the driver, damn it. 2014-06-05 22:50:24 -04:00
Hubblenaut
5098c6a85c Makes crashing into things possible with extinguisher or harm intent 2014-06-05 22:49:38 -04:00
Hubblenaut
1e450d301d Adds Wheelchairs with basic driving functionality 2014-06-05 22:49:20 -04:00
PsiOmega
305ee44aaa Creates a proper area instance for the new engineering shuttle room, to avoid issues with multiple APCs among other things.
Replaces the vent in the fitness room with one which does not show it's connection pipe.
Properly aligns conveyor belt levers on the Research outpost with each other.

Re-locates cameras to improve coverage (no additions), with the purpose of ensuring that the AI can assist in opening main doors (fun times) by seeing both sides.
Affects:
Virology Entrance - Can now see people south of door connecting Viro/Medbay.
Permanent Brig - Can now see the north set of doors by default (would randomly gain coverage, potentially caused by doors closing/opening)
East Central Primary Hallway - Coverage would previously be lost if chemists closed their window shutters.
South Central Primary Hallway - Can now see the south set of doors to the engineering lobby, default coverage of the HoP's and nearby all-access doors (again, coverage would eventually be granted by unknown process)
West Mining Wing - Can now assist in opening both sides of the bridge connecting the wings
2014-06-05 10:53:38 +02:00
Zuhayr
dfa6d8ef15 Merge branch 'shuttlecontroller' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-04 19:14:00 +09:30
Chinsky
da2ae4d507 Merge pull request #5143 from MrLeebo/mutiny
Mutiny Mode Fixes
2014-06-04 13:13:57 +04:00
Chinsky
5277840766 Merge pull request #5137 from faerindel/smes_maketerminal
SMES buildable terminal fix.
2014-06-04 13:13:24 +04:00
Jeremy Liberman
bc1628378d Rephrase text based on code review 2014-06-03 21:51:21 -05:00
Jeremy Liberman
2a6e6bb021 Merge branch 'dev' into mutiny 2014-06-03 21:27:42 -05:00
Jeremy Liberman
dc67453796 Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel. 2014-06-03 21:26:34 -05:00
mwerezak
8a1391315d Merge remote-tracking branch 'upstream/dev' into vox-skipjack 2014-06-03 21:51:31 -04:00
Ccomp5950
ad4c35fd29 Merge pull request #5133 from mwerezak/custom-item-yankeesamurai
Adds custom item for yankeesamurai - Hal Ishimaru
2014-06-03 19:50:35 -05:00
igalan
d16f3bb743 -Fixed: Trying to build a terminal without enough cables would leave SMES bugged out until VV'ed.
-Made maximum input and output values depend on a variable instead of a define directly. For VV or future customizable SMESes.
-Made reattempting to charge a bit smoother.
-ion_act()'s explosion is now logged.

And that's it. It's just a 30something lines commit, geez.
2014-06-03 17:35:14 +01:00
Zuhayr
99ffd06285 Moved the supply shuttle arrival/departure over to the shuttle datum. Needs testing, probably going to break. 2014-06-04 00:58:03 +09:30
Zuhayr
7a56a174dc Converted Syndicate shuttle over to multi-shuttle setup. 2014-06-04 00:08:10 +09:30
Zuhayr
54b08ff55a Moved the Vox skipjack console over to a multi-destination shuttle datum setup. 2014-06-03 23:21:10 +09:30
Zuhayr
ba4293d5c4 Merge pull request #5125 from GinjaNinja32/crew-monitor
Crew monitor
2014-06-03 20:26:04 +09:30
Zuhayr
3b84ec95fd Merge pull request #5123 from GinjaNinja32/barsign
Barsign change mechanism
2014-06-03 20:25:43 +09:30
Ccomp5950
ca7b78b3a2 Merge pull request #5124 from Zuhayr/dev
Replaces the Derelict with a construction site.
2014-06-03 05:26:11 -05:00
Zuhayr
ca48504bf5 Update shuttle.dm
Corrected a mistake.
2014-06-03 18:08:35 +09:30
Zuhayr
c01b124ac7 Added a 'controller' for shuttles (really just a data container), fixed up the admin shuttle verbs into one general verb, changed shuttles to use controller instead of populating lists at spawn. 2014-06-03 18:06:05 +09:30
Zuhayr
405055eda8 Some cleanup stuff for prior commits. 2014-06-03 15:40:40 +09:30
Zuhayr
00c81bb675 Moved engineering, research and mining shuttles to a generalized system with its own directory structure. 2014-06-03 15:26:34 +09:30
Zuhayr
a2865625a5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-06-03 14:27:46 +09:30
Mloc
c74c0630c2 Merge pull request #5126 from faerindel/smes_maketerminal
Made SMES terminals able to be constructed and deconstructed.
2014-06-02 22:20:39 +01:00
igalan
2eae518ea2 Nitpickity addressed: Added span classes. 2014-06-02 21:58:06 +01:00
Chinsky
a086043a9b Merge pull request #5116 from mwerezak/round-end
Round no longer ends suddenly
2014-06-02 23:00:48 +04:00
Chinsky
d5808b8e68 Merge pull request #5093 from RavingManiac/dev
Implosion-explosion style supermatter detonation
2014-06-02 22:58:23 +04:00
GinjaNinja32
4091bcf7b3 Change selection interface to have cancel button 2014-06-02 15:39:43 +01:00
igalan
64e56aaa20 Made SMES terminals able to be constructed and deconstructed.
Way to do:
-Open maintenance hatch with screwdriver.
-Apply cables (at least 10)/wirecutter.

Code is modified and corrected /vg/ code.
2014-06-02 12:13:26 +01:00
GinjaNinja32
a786f72e33 Fix NanoUI autoupdating 2014-06-02 09:59:38 +01:00
GinjaNinja32
42d8344f7d Change crew monitoring computer to use NanoUI 2014-06-02 09:29:34 +01:00
GinjaNinja32
0f59d78c84 Added mechanism to change barsign design, so bartenders aren't stuck with whatever the RNG picks. 2014-06-02 08:27:13 +01:00
Zuhayr
ba9434366c Replaces the derelict, modifies the DJ station, adds a shuttle bay to Engineering. 2014-06-02 15:54:40 +09:30
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30
mwerezak
e91f285ce9 Adds cleanup for heist mode 2014-06-01 17:01:35 -04:00
mwerezak
cc4a6e0f26 Fixes config.continous_rounds and adds check 2014-06-01 15:49:13 -04:00
RavingManiac
6b6a07c932 Supermatter becomes anchored when detonating, and is hence not pushed by mobs than gib against it.
Detonating supermatter immediately turns the zone into vacuum.
Spam from objects disintegrating against detonating supermatter removed.
Pull radius increased to 14.
2014-06-02 03:34:58 +08:00
mwerezak
dbe43db59a Round no longer ends suddenly
Instead, a crew transfer vote is called. Also adds cleanup proc to
game_mode.
2014-06-01 14:50:57 -04:00
Hubblenaut
eb23c44c8a Removes explosive implants from nuke ops 2014-06-01 20:15:39 +02:00
mwerezak
86b6ffb2c3 Vox skipjack now filled with nitrogen
Added an oxygen canister, breathmasks and tanks for "guests," thought I
don't think they will be needed since people rarely get to the skipjack
without internals of their own.
2014-06-01 13:24:18 -04:00
Chinsky
82b6e76d4c Merge pull request #5086 from UristMcKerman/spam-filter
Spam filter
2014-06-01 20:09:06 +04:00
Zuhayr
5563fa9471 Typo. 2014-06-02 00:02:08 +09:30
Zuhayr
a7c3c67da8 Fixes #5098 2014-06-01 21:09:30 +09:30