Brian McGillivray
23139987a0
Tweak: Mr Chang's vending machine now refillable
...
Changed the Mr Chang's vending machine to be able to be refiled with a
new Chinese vending refill canister crate that can be ordered by Cargo.
2017-02-02 15:49:27 +00:00
Fox McCloud
3d587dea5b
Merge pull request #6177 from uraniummeltdown/new
...
Cyborg Blueprints
2017-02-02 00:50:33 -05:00
uraniummeltdown
7259e4ce07
blueprints for engiborgs
2017-01-31 19:22:29 +04:00
Fox McCloud
0874ea7295
Merge pull request #6152 from uraniummeltdown/windowflash
...
Window Flashing
2017-01-31 01:30:39 -05:00
Fox McCloud
a1ac4a9ec2
Merge pull request #6231 from Aurorablade/ThePowerOfSalt
...
THE POWER OF SALT COMPELS YOU
2017-01-26 10:52:44 -05:00
Aurorablade
55e58ef471
honk
2017-01-26 10:39:48 -05:00
Crazy Lemon
0e42e416b6
Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor
...
Makes Reagents Holder Process and Refactors NOREACT
2017-01-26 03:47:30 -08:00
Crazy Lemon
15dca8b4aa
Merge pull request #6226 from Fox-McCloud/debug-this
...
Removes Unused Object
2017-01-25 04:15:18 -08:00
Aurorablade
29c6a89f45
removes processed bread
2017-01-24 23:24:49 -05:00
Aurorablade
318c339f11
icons are silly
2017-01-23 18:32:40 -05:00
Aurorablade
eb4b320676
fox changes
2017-01-23 18:31:13 -05:00
Aurorablade
64b8200823
changes
2017-01-22 19:42:13 -05:00
Aurorablade
1769672037
this icon was a thing....
2017-01-21 19:37:08 -05:00
Aurorablade
8f3ea0d5cb
blrghh
2017-01-21 08:50:58 -05:00
Aurorablade
559fcebb57
ferp
2017-01-21 08:50:30 -05:00
Aurorablade
0d125c20a0
why do i do this..
2017-01-21 06:17:06 -05:00
Fox-McCloud
723e87effd
Removes Unused Object
2017-01-20 21:50:00 -05:00
Crazy Lemon
2a209f62cd
Merge pull request #5814 from Markolie/ann2
...
Announcement refactor
2017-01-18 19:17:30 -08:00
Crazy Lemon
37a7484976
Merge pull request #6149 from FlattestGuitar/log-upgrade
...
Adds log stacking to admin logs
2017-01-18 19:13:50 -08:00
Mieszko Jędrzejczak
1b506aaf9f
Switches over to the new system
2017-01-17 13:57:07 +01:00
Chakirski
b41009c685
matter_is_neither_created_nor_destroyed
2017-01-16 00:54:56 -06:00
Fox-McCloud
ea8080e6c9
Makes Reagents Holder Process and Refactors NOREACT
2017-01-14 20:09:49 -05:00
Crazylemon64
224f86bd64
Bibles can reveal runes now
2017-01-13 13:42:56 -08:00
TullyBurnalot
8dd1856121
Graffiti prints are now hidden
2017-01-12 20:24:17 +00:00
TullyBurnalot
cb4674fb78
Graffiti now have fingerprints
2017-01-12 19:54:36 +00:00
uraniummeltdown
11c0cb73f6
added it to defib, cloning, strange reagent
2017-01-12 19:44:18 +04:00
Fox McCloud
68dfbf6217
Merge pull request #6131 from Crazylemon64/robot_module_actions
...
Robot module actions
2017-01-11 08:50:50 -05:00
Crazylemon64
a852d3f314
Fixes a garrote runtime
2017-01-10 18:28:40 -08:00
Crazy Lemon
f1c3a7cd13
Merge pull request #6085 from Fox-McCloud/food-rework
...
Food rework
2017-01-10 12:11:17 -08:00
Crazylemon64
36b967c93b
Fully rips out cyborg sight modules
2017-01-10 00:32:11 -08:00
Crazylemon64
131978db2d
Borgs now actually have their module actions revoked upon module removal
2017-01-10 00:18:46 -08:00
Crazylemon64
ec0f13d41e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2017-01-06 05:01:43 -08:00
Crazylemon64
ac612d4924
Fixes construction talisman
...
Fixes supply talisman
2017-01-06 04:32:59 -08:00
Aurorablade
113f2770e3
somethingsomethingcaffine
2017-01-06 06:33:12 -05:00
Aurorablade
7fb084d690
tries to address comments...
...
and will get them wrong.
2017-01-05 22:07:21 -05:00
Crazylemon64
f954382619
Adds a ui_key arg to ui_data
2016-12-31 12:51:07 -08:00
Markolie
1f243ec4f0
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
...
# Conflicts:
# code/_globalvars/lists/objects.dm
2016-12-31 17:54:06 +01:00
Aurorablade
98b7a89a17
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
...
# Conflicts:
# code/game/machinery/doors/airlock.dm
2016-12-29 11:01:43 -05:00
Aurorablade
e25ddf8329
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI
2016-12-24 00:18:40 -05:00
Markolie
e2587dbbbf
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
...
# Conflicts:
# code/game/gamemodes/events.dm
# code/modules/awaymissions/bluespaceartillery.dm
2016-12-23 19:04:35 +01:00
Fox McCloud
5a01a6c7d3
Merge pull request #5840 from Crazylemon64/adds_reset_perspective
...
Polishes up `reset_view`
2016-12-23 07:27:36 -05:00
Crazylemon64
4b1915a02f
Adds the advanced camera console tweak
2016-12-21 18:07:06 -08:00
Crazylemon64
c0cd2c263f
Switches reset_view to reset_perspective
2016-12-21 17:59:08 -08:00
Crazylemon64
6d3e66f41c
Polishes up the reset_view proc, which is basically
...
`reset_perspective` from tgstation.
Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things
Recommit because we're using different compiler versions
2016-12-21 17:56:57 -08:00
Fox McCloud
398c3dce34
Merge pull request #5986 from tigercat2000/nano_patch_25
...
NanoUI Update: Seperate UI Data into ui_data() proc
2016-12-21 13:22:10 -05:00
TullyBurnalot
51a47b37b0
- 180 Reverse, Mines now banned from surplus
2016-12-20 10:09:38 +00:00
TullyBurnalot
e9f4209188
Proximity Mines now work for everyone
...
- Buttons are buttons
2016-12-19 01:09:34 +00:00
Tigercat2000
b9abce843d
NanoUI Update: Seperate UI Data into ui_data() proc
...
This commit changes how NanoUI's live data updating system works.
Previously, data for the template was directly gathered in the
ui_interact proc. Now, it is seperated into the proc `ui_data`.
To players, this does absolutely nothing.
To coders, this opens up the potential for a much more complicated and
fancy graphical updating system in the future, because the data is
available on-demand without ever having to call
nanomanager.try_update_ui.
2016-12-14 13:37:34 -08:00
Fox-McCloud
7a55ec18fc
Merge remote-tracking branch 'upstream/master' into food-rework
2016-12-05 12:40:32 -05:00
Aurorablade
2dc1a48f35
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI
2016-12-01 22:38:35 -05:00
