Commit Graph

13050 Commits

Author SHA1 Message Date
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
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
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
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
Zuhayr
69c882bfec Fixes #4973 2014-06-01 20:46:58 +09:30
Zuhayr
f259aff8c6 Fixes #5109 2014-06-01 20:07:22 +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
46df8d4cef Allowed drones to login to airlock electronics. 2014-05-31 22:15:47 +09:30
Zuhayr
5f98ccaaf8 Added smaller spraybottle for drones. 2014-05-31 22:15:28 +09:30
Zuhayr
7bb01f94ca Merge pull request #5104 from Ccomp5950/ghosts
Ghost dsay verbs.
2014-05-31 20:08:29 +09:30
Ccomp5950
b6b4d0826f Ghost dsay verbs.
Now a bit more accurate.
2014-05-31 02:33:51 -05:00
Zuhayr
825a77b702 Fixes end of round drone spam. 2014-05-31 15:38:10 +09:30
Zuhayr
42ed91feda Actually fixes #5100 2014-05-31 15:13:50 +09:30
Zuhayr
ed3a8ac44b Fixes #5100 2014-05-31 15:11:08 +09:30
Chinsky
2bf07db0ee Merge pull request #5095 from Walter0o/AA_exploit
airalarm exploit fixes
2014-05-31 05:24:02 +04:00
mwerezak
69e75319a6 Merge branch 'undress' into small-changes 2014-05-30 20:19:41 -04:00
mwerezak
820802cdaa Merge branch 'vending-anchor' into small-changes 2014-05-30 20:10:09 -04:00
mwerezak
2ad2be668f Cleaner implementation of secure electronics 2014-05-30 20:07:20 -04:00
mwerezak
c55747272a Makes it harder to accidentally undress yourself 2014-05-30 20:01:16 -04:00
mwerezak
7a6bbf2249 Fixes accidental copypasta 2014-05-30 19:45:29 -04:00
mwerezak
07d8a1442a Adds secure airlock electronics
Also, secured_wires can be set through the airlock constructor.
2014-05-30 19:38:35 -04:00
Walter0o
4bca02e2f7 airalarm exploit fixes
airalarm had various checks missing, e.g. making sure the AA
was unlocked before triggering panicsyphon and the like.

added proper rangecheck, added var checks for the different types of calls.

also replaced usr.machine = src with usr.set_machine(src) so the
window updates properly for silicon mobs using the machine from afar.

i had no time to look for functionality exploits, this commit merely makes sure
the commands can only be called in proper circumstances.
2014-05-31 01:34:55 +02: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
mwerezak
432ebcdd2d Bolt dropping wire, please 2014-05-30 19:08:16 -04:00
mwerezak
3a59ee0899 Adds ability to have airlock wires randomized
Adds a secured_wires var to airlocks that may be set through mapping. If
not set to 0, the airlock's wires will be randomized for that airlock,
instead of using the global wiring scheme.
2014-05-30 19:05:57 -04:00
mwerezak
a98d9eef3d Vending machines can now be unanchored 2014-05-30 18:35:20 -04: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