Cheridan
6a9a5c820e
Merge pull request #13560 from Incoming5643/and_as_the_sword_looked_upon_the_infinite_cosmos_it_knew_it_just_had_to_try_and_fuck_everything_up
...
Supermatter swords and the infinite void
2015-12-12 23:22:48 -06:00
Cheridan
c641643c55
Merge pull request #13539 from KorPhaeron/dance_moves
...
Hitting someone with a dualsaber now has a chance to make you *flip
2015-12-11 17:27:42 -06:00
Cheridan
78093c0bf0
Merge pull request #13556 from bgobandit/matsagainfuckina
...
Adds mats/origin tech/burn_state to more items.
2015-12-11 17:13:42 -06:00
Incoming
8ee40a1518
supermatter now reduces turf to base turf, and checks for base turf instead of space.
...
(in most settings, base turf IS space)
2015-12-10 19:46:35 -05:00
Incoming
a05e29b27e
Supermatter swords can no longer consume space itself to spam radiation at people.
2015-12-10 17:13:40 -05:00
bgobandit
984582f6ba
tweaks and shit
2015-12-10 15:48:22 -05:00
bgobandit
92d86dd369
Adds mats/origintech/burn_state to more items.
2015-12-10 15:32:28 -05:00
KorPhaeron
50e4e77250
Fixes UI stuff
2015-12-09 21:37:18 -06:00
KorPhaeron
56ecfaff68
Flip
2015-12-09 19:59:12 -06:00
duncathan salt
bea8d35ff5
Merge pull request #13437 from neersighted/clickable_stats
...
Refactor MC/Failsafe/add Subsystems
2015-12-07 19:58:46 -06:00
duncathan salt
0472592b97
Merge pull request #13327 from KorPhaeron/reactive
...
check_shields() refactor
2015-12-07 19:58:17 -06:00
Remie Richards
91c4d1bef8
Merge pull request #13440 from octareenroon91/patch-32
...
Give wallets merged access of all IDs inside.
2015-12-07 17:37:44 +00:00
octareenroon91
5646f0eb5b
syntax error
2015-12-05 18:42:50 -06:00
MrStonedOne
9fa4288b08
Makes everything that used spawn () throw_at use throw_at_fast
2015-12-05 16:40:52 -08:00
octareenroon91
3c75d78f84
Use a list instead of net_id
...
reduce excess calls to update_icon()
2015-12-05 16:35:41 -06:00
Bjorn Neergaard
34b717afb4
radio_controller -> SSradio, SSbp -> SSnpc
2015-12-04 22:25:24 -06:00
octareenroon91
544295c563
define proc/refreshID
2015-12-04 03:42:54 -06:00
octareenroon91
f3f61367da
Give wallets merged access of all IDs inside.
2015-12-04 03:16:43 -06:00
Cheridan
dd768b9046
Merge pull request #13369 from neersighted/caps
...
Capitals for Tank logging
2015-12-02 19:09:30 -06:00
Cheridan
f634890457
Merge pull request #13335 from Incoming5643/fudge_dice
...
Fudge dice
2015-12-02 16:40:25 -06:00
duncathan salt
fd5423e0cc
Merge pull request #13340 from KorPhaeron/oxy_tank
...
Internals start at 16 pressure
2015-12-02 14:16:29 -06:00
Bjorn Neergaard
b7ad1452ed
Caps for Tank logging
2015-12-01 18:48:35 -05:00
duncathan salt
d616885241
Merge pull request #13338 from Incoming5643/tis_the_season_for_horrible_manual_placement
...
[Touching all the maps oh god] The reason for the season
2015-12-01 15:15:49 -06:00
Incoming
42da16a003
adds swankcookie's snowman stuff to the gifts that will spawn on christmas should the trees exist which hopefully they will!
2015-11-30 19:21:53 -05:00
KorPhaeron
c29f2ef837
Internals start at 16 pressure
2015-11-30 18:12:32 -06:00
Vincent
b31b5e3f77
Fix Conflicts:
...
code/game/machinery/doors/windowdoor.dm
2015-11-30 18:56:43 -05:00
KorPhaeron
6be3a6fd58
Cleans up copypaste but this time it compiles
2015-11-30 16:50:17 -06:00
KorPhaeron
fab3cdc3a2
Cleans up copypaste, adds missing block chances
2015-11-30 16:39:02 -06:00
KorPhaeron
2609adb29d
Blocking overhaul
2015-11-30 16:22:31 -06:00
Incoming
0c1d7272d5
Adds fudge dice
...
They're six sided dice with two pluses, two minusii, and two blank sides.
They're also a jokey recipe you can create with any dice and a chocolate bar. Once you eat the literal fudge die you get a fudge die no matter what kind of die you used into its creation. This is INTENTIONAL AND PART OF THE JOKE.
Adds them to the "rare dice" spawn in dice bags.
Formally defines a d6 as a separate thing from the generic parent die. the generic parent die is still a d6 for all intents and purposes except for the fact that it's now just called a generic "die" instead of a d6. This was so the recipe didn't list a d6 as needed for the fudge dice recipe when really any die would do.
Doesn't replace existent generic die with d6eses on the maps because I don't want this to conflict for a million years. I'll swap out the generic dies at some future point after this is added.
2015-11-30 15:19:25 -05:00
Razharas
78c95ab035
Merge pull request #13317 from neersighted/airlock_electronics
...
NanoUI Airlock Electronics
2015-11-30 20:43:33 +03:00
duncathan salt
ad410e39d8
Merge pull request #13296 from neersighted/nanoui_checks
...
Fix some NanoUI checks
2015-11-29 18:36:18 -06:00
Vincent
05ae680b06
Fixing conflicts:
...
code/game/machinery/computer/computer.dm
code/game/machinery/doors/windowdoor.dm
code/game/objects/structures/window.dm
2015-11-29 19:02:30 -05:00
Bjorn Neergaard
06e5df9336
Fix NanoUI missing assignment; use two-line ifs
2015-11-29 18:20:10 -05:00
Bjorn Neergaard
f214e547cb
NanoUI Airlock Electronics
...
Also reworks a lot of the AE code.
2015-11-29 11:32:56 -06:00
Jordie
e9ea0d8dc9
Merge pull request #13275 from swankcookie/snowman
...
Adds Snowman costume
2015-11-29 21:08:11 +11:00
Jordie
da0c466f82
Merge pull request #13149 from Firecage/toolspeed
...
Adds toolspeed
2015-11-29 21:06:15 +11:00
Jordie
06134d5f19
Merge pull request #13104 from GunHog/OfTeleportsAndNames
...
Hand Tele now displays its destination.
2015-11-29 21:06:01 +11:00
PKPenguin321
8e09b00f2c
Merged upstream
2015-11-28 15:49:41 -08:00
Cheridan
2fc49bbcad
Merge pull request #13265 from PKPenguin321/kor-you-lazy-fuck
...
Mounted Chainsaw Inhands 2.0
2015-11-28 17:01:35 -06:00
PKPenguin321
36d92b8c2d
fixes everything
...
i broke everything by giving teleprods a unique attack_self but forgetting to include the original functions of attack_self, making them unable to turn on/off. this fixes that.
2015-11-28 14:57:36 -08:00
Razharas
e715e1cc57
Merge pull request #13195 from neersighted/nanoui_update
...
[WIP|DNM] Update NanoUI
2015-11-28 14:17:49 +03:00
swankcookie
0b7b49d8c4
fixes issue of missing suit and hat in vendor
2015-11-28 03:11:05 -06:00
PKPenguin321
5382db940d
adds mounted chainsaw inhands, repaths mounted chainsaws to actually use them, makes the lines for mounted chainsaws use tabs instead of filthy spaces
2015-11-27 14:56:23 -08:00
Vincent
0218d51938
Better fireaxe-grill interactions
2015-11-27 15:38:37 -05:00
Remie Richards
62d301bfe5
Merge pull request #12998 from YotaXP/drone-fixes
...
Allows drones to use 'pick up' and watertanks
2015-11-27 20:38:23 +00:00
Bjorn Neergaard
5f108eef4e
Merge remote-tracking branch 'tgstation/master' into nanoui_update
2015-11-27 15:31:35 -05:00
Bjorn Neergaard
b897fb6d72
Fix NanoUIs flashing, update Tanks, Solars, and Canisters
2015-11-27 15:30:18 -05:00
YotaXP
68dbc7cf27
Code formatting!
...
Dat online PR editor.
2015-11-27 15:18:16 -05:00
Remie Richards
fdede51a09
Merge pull request #12954 from MMMiracles/spookycaves
...
New Away Mission: Caves
2015-11-27 20:11:26 +00:00
