Commit Graph

7557 Commits

Author SHA1 Message Date
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
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
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
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
d5808b8e68 Merge pull request #5093 from RavingManiac/dev
Implosion-explosion style supermatter detonation
2014-06-02 22:58:23 +04: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
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
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
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
Zuhayr
81af443155 Drones fixes. 2014-06-01 20:51:58 +09:30
RavingManiac
132e527020 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-06-01 16:13:04 +08:00
Zuhayr
6eab07743a Merge pull request #5108 from Zuhayr/master
Drone door fix.
2014-06-01 02:41:22 +09:30
Zuhayr
a8ecbeb518 Drone door fix. 2014-06-01 02:38:02 +09:30
Zuhayr
9c5fe5d9f3 Merge pull request #5106 from Zuhayr/master
Drone fixes.
2014-06-01 02:08:30 +09:30
Zuhayr
a3be005113 Adds a drone spawn blurb. 2014-06-01 02:05:25 +09:30
Zuhayr
273f729eee Several drone fixes (walking over, pushing, pulling, AI sync) 2014-05-31 22:28:05 +09:30
Zuhayr
5f98ccaaf8 Added smaller spraybottle for drones. 2014-05-31 22:15:28 +09:30
Ccomp5950
b6b4d0826f Ghost dsay verbs.
Now a bit more accurate.
2014-05-31 02:33:51 -05:00
mwerezak
c55747272a Makes it harder to accidentally undress yourself 2014-05-30 20:01:16 -04:00
mwerezak
d5217fef9d Custom item for YankeeSamurai: Hal Ishimaru 2014-05-30 19:52:54 -04:00
Mloc-Argent
3d2cc3cd82 Revert "Merge pull request #4985 from jack-fractal/dev"
This reverts commit 1679b4062f, reversing
changes made to b149b273d9.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/datums/visibility_networks/update_triggers.dm
2014-05-31 00:25:56 +01:00
Mloc-Argent
ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm
2014-05-31 00:17:56 +01:00
RavingManiac
ad810f0a4a Supermatter shards have a smaller pull-radius.
Leftover variable removed.
2014-05-31 00:28:38 +08:00
RavingManiac
bf0c972677 Unanchored objects and players without magboots are pulled twice as fast towards the supermatter. 2014-05-30 21:17:40 +08:00
RavingManiac
12aa2ebe6c Before detonation, supermatter pulls all objects, including anchored objects in a 13-tile radius (just enough to cover the control room) towards it for 10 seconds. Windows within this radius are immediately shattered.
Supermatter no longer pushed around by airflow.
2014-05-30 20:47:40 +08:00
UristMcKerman
3f80a82c7e Fix
No everlasting events.
2014-05-30 14:47:13 +04:00
Chinsky
3ea17cefaf Merge pull request #5083 from mwerezak/co2
New System for CO2 Asphixyation
2014-05-30 12:44:26 +04:00
Ccomp5950
fd78c58f46 Bot down? Let's not lock up the entire server.
Instead we'll spawn a thread to handle it, not like we care what is returned either way.
2014-05-29 21:36:34 -05:00
Mike
06eb4c6edf C02 -> carbon_dioxide
Renamed carbon dioxide breathing type string to hopefully prevent
confusion in the future.
2014-05-29 20:17:51 -04:00
UristMcKerman
e37a70089b Tweaks for spam #2
Added brackets surrounding tokens to make whitespace and empty tokens
removable.
Slightly modified ion storm behavior.
Increased duration required to stop spam to 5 minutes.
Added ability to expand spam filter limit with installation of message
monitor circuits.
People will see why their message been discarded.
Discarded messages will be highlighted with red color in message log.
2014-05-29 16:05:00 +04:00
Zuhayr
045168ba17 Merge pull request #5082 from mwerezak/inaprovaline
Inaprovaline no longer a substitute for breathing
2014-05-29 11:19:18 +09:30
UristMcKerman
c78605b1a4 Tweaks for spam
Added non-randomized example tokens at start. Added filter limitation.
Ion storm will replace tokens with garbage. Spam disaster lasts longer
and is more severe.
2014-05-29 00:31:02 +04:00
mwerezak
9747276eb1 Fixes missing 'else' 2014-05-28 11:47:20 -04:00