Commit Graph

7542 Commits

Author SHA1 Message Date
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
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
mwerezak
47a7617edd Inaprovaline no longer a substitute for breathing 2014-05-28 11:27:21 -04:00
mwerezak
d677a91c3c Adjusts co2 warning frequencies 2014-05-28 10:59:02 -04:00
UristMcKerman
0a0ce28f68 Added spam filter
Added spam filter functionality to message server and message server
monitor.
2014-05-28 17:12:18 +04:00
Ccomp5950
e4f561ce4d Merge pull request #5080 from comma/dev
Added new BBCode tags, for tables and NT logo.
2014-05-28 03:22:30 -05:00
Zuhayr
8f50fbcd3b Fixes #4940 2014-05-28 17:00:31 +09:30
Zuhayr
c2b97b7fcb Fixes #4643 2014-05-28 16:41:54 +09:30
Chinsky
61f00628f1 Added new BBCode tags, for tables and NT logo. Removes html support from paper. 2014-05-28 10:49:24 +04:00
Chinsky
ec37f1f5d2 Merge pull request #5079 from Jarcolr/custom_items
Adds *2* custom items and updates a sprite
2014-05-28 09:17:00 +04:00
Ccomp5950
4bb59352f5 Merge pull request #4968 from MrLeebo/mutiny
Mutiny Mode
2014-05-28 00:13:42 -05:00
Jarcolr
f318e24827 Adds 2 custom items and updates a sprite
Paths are:
/obj/item/clothing/glasses/eyepatch/fluff/edmund
/obj/item/clothing/suit/storage/fluff/lombardi
2014-05-27 20:47:01 +03:00
Chinsky
4594e2bf1b Merge pull request #5071 from Ravensdale/dev
Updates most used viable entries of Tau Ceti to Nyx
2014-05-27 21:46:43 +04:00
mwerezak
32f6d89bea Completed unfinished species.breath_type switch 2014-05-27 03:00:31 -04:00
mwerezak
fbaa84c509 More sensible oxyloss scaling 2014-05-27 02:41:12 -04:00
mwerezak
694f0706bb Fixes inhale_pp ratio
The amount of inhaled gas used shouldn't approach infinity as inhale_pp
goes to zero, should it?

Also the amount of gas used should decrease with inhale_pp as the
oxyloss is being caused by the fact that fewer moles are entering the
bloodstream.
2014-05-27 02:39:32 -04:00
mwerezak
2160aae1ab New system for CO2 asphixyation
Too much CO2 now makes you slowly gain oxyloss instead of making you
fall unconscious immediately and quickly killing you after 30 seconds.
2014-05-27 02:20:15 -04:00