Commit Graph

13606 Commits

Author SHA1 Message Date
Hubblenaut
106d0a4811 Fixed an issue with IBs being almost twice as bad 2014-06-05 00:02:44 +02:00
Zuhayr
65a2f590b7 Merge pull request #5136 from Zuhayr/master
Serithi's request, taj and unathi spawn with sandals.
2014-06-04 19:52:00 +09:30
Zuhayr
dfa6d8ef15 Merge branch 'shuttlecontroller' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-04 19:14:00 +09:30
Chinsky
13633b06db Merge pull request #5142 from mwerezak/vox-breathmask
Fixes #5138
2014-06-04 13:14:18 +04:00
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
Zuhayr
a00d4295a4 Fixed small drone talk and Bump() issues. 2014-06-04 16:26:12 +09:30
Zuhayr
e0fb68d810 Fixed that odd name issue with podspawn dionaea. 2014-06-04 16:25:51 +09:30
Zuhayr
a661f3ee50 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-06-04 16:11:45 +09:30
Zuhayr
1865d5f8e7 Merge pull request #5135 from DJSnapshot/hotfix
color change for mentor OOC
2014-06-04 15:48:03 +09:30
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
Ccomp5950
e490cfbea9 Merge pull request #5130 from mwerezak/drone-access
Drone Fixes
2014-06-03 19:49:15 -05:00
mwerezak
cc50ddf0d5 Fixes #5138 2014-06-03 20:10:24 -04:00
mwerezak
715056fca7 Readds tator fab to drone bay 2014-06-03 20:01:16 -04:00
Ccomp5950
f0a75407b8 Rights check instead of holder check? Sure why not.
Mentors can now see ahelps.
2014-06-03 15:28:14 -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
aa643865dd Serithi's request, taj and unathi spawn with sandals. 2014-06-04 00:56:17 +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
Loganbacca
7d7d095e5c New vehicle framework
- Implements a new vehicle framework
- Adds cargo trains
2014-06-03 22:18:49 +12: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
DJSnapshot
32bb0f25c1 color change ( http://i.imgur.com/6SAj7OT.png ) 2014-06-02 23:17:23 -07:00
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
mwerezak
a6bc516313 Readds flashes to all robots except drones.
Drones also get a special low-power flashlight, now.
2014-06-02 23:05:37 -04:00
mwerezak
29fac4e05c Adds drone cameras to engineering network 2014-06-02 20:13:23 -04:00
mwerezak
6b11904e28 Fixes all robot_modules having access to flashes 2014-06-02 20:09:09 -04:00
mwerezak
5a1782f2f1 ID swiping drones now uses visible_message() 2014-06-02 19:52:18 -04:00
mwerezak
475bd59284 Fixes #5118
Also fixes robot/access() so that it will accept any one of the accesses
in req_access, instead of all - a much more likely use case.
2014-06-02 19:38:33 -04:00
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
Mloc
171a8e2111 Merge pull request #5127 from Ccomp5950/mentor_change
Mentor Unnerf.
2014-06-02 22:20:24 +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
Chinsky
6599545499 Merge pull request #5119 from boopcat/happydrones
refactors some disposals filtering code and remaps some disposals pipes
2014-06-02 18:19:28 +04:00
Ccomp5950
1350115824 Mentor Unnerf.
JMP was doing a rights check in the Topic instead of doing it on the proc, just went ahead and fixed the rights check to include mentors.
Mentors now have player panel but can't see traitor panel.  The idea is so they can't tell who is an antag through this.
2014-06-02 07:09:00 -05: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