Fox-McCloud
80587202fe
forcemove fixes
2017-01-27 21:03:57 -05:00
Fox-McCloud
9fd8718bc7
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-27 19:31:07 -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
Fox-McCloud
51bbe8c466
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-26 06:53:18 -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
Aurorablade
29c6a89f45
removes processed bread
2017-01-24 23:24:49 -05:00
Fox-McCloud
36bfee25dc
last of the missing stuff, hopefully
2017-01-24 18:33:22 -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
Fox-McCloud
3e87bd3370
more adjustments and fixes
2017-01-23 05:56:17 -05:00
Fox-McCloud
5c828db250
fixes, comfrey, and aloe
2017-01-23 05:25:42 -05:00
Fox-McCloud
7007f6bbdf
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 01:01:09 -05:00
Fox-McCloud
dc0710135e
more fixes
2017-01-23 00:53:44 -05:00
Fox-McCloud
104bfab759
sprite and code fixes
2017-01-22 23:25:56 -05:00
Aurorablade
64b8200823
changes
2017-01-22 19:42:13 -05:00
Fox-McCloud
706347fd84
even more work
2017-01-22 08:11:31 -05:00
Aurorablade
1769672037
this icon was a thing....
2017-01-21 19:37:08 -05:00
Fox-McCloud
ea76990b7a
Botany Rework
2017-01-21 18:28:03 -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
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
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
ec0f13d41e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2017-01-06 05:01:43 -08:00
Crazylemon64
f954382619
Adds a ui_key arg to ui_data
2016-12-31 12:51:07 -08: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
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
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
fa1aa894ea
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-12-01 18:04:07 -05:00
Fox-McCloud
a1b8205fdd
food
2016-11-29 08:45:46 -05:00
Crazylemon64
e212308cac
The RCD making doors no longer has a shallow copy
...
This means that changing accesses on the RCD will no longer
change accesses made on prior doors
2016-11-28 02:25:05 -08:00
Crazy Lemon
b769147449
Merge pull request #5897 from FlattestGuitar/e20
...
e20 gets logged now
2016-11-23 13:22:16 -08:00
Aurorablade
0c637cebfa
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub
2016-11-22 01:48:56 -05:00
Mieszko Jędrzejczak
7874bba921
e20 get logged
2016-11-20 01:42:22 +01:00
KasparoVy
0b23981f1b
Fix.
...
The spawnable DNA Injectors containing powers (XRay, etc.) will now
activate/deactivate the powers correctly.
2016-11-19 18:29:43 -05:00
Aurorablade
5d392b36a4
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
2016-11-15 15:30:36 -05:00
