Commit Graph

6002 Commits

Author SHA1 Message Date
Chakirski b41009c685 matter_is_neither_created_nor_destroyed 2017-01-16 00:54:56 -06:00
Crazylemon64 224f86bd64 Bibles can reveal runes now 2017-01-13 13:42:56 -08:00
TullyBurnalot a0d1f4333c Removes needless "The"s 2017-01-12 22:17:52 +00:00
TullyBurnalot 632030daa3 Addressing request by Fox 2017-01-12 22:05:13 +00:00
TullyBurnalot d8d5279d66 Cyborg tools not allowed in display cases 2017-01-12 21:36:19 +00: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
Aurorablade 5a07759c97 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Bugsie 2017-01-11 23:41:06 -05: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
Fox McCloud ef3e433f07 Merge pull request #6125 from Crazylemon64/spiders_non_xeno
Giant Spiders no longer clog up the Alien role channel
2017-01-10 17:46:43 -05: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 66f2d40afa Giant Spiders no longer clog up the Alien role channel 2017-01-09 13:38:34 -08:00
Fox McCloud 8b7ce46155 Merge pull request #5959 from Markolie/fixinwall
False walls now block atmos
2017-01-07 14:19:53 -05:00
Aurorablade 155464b3a0 brain.exe had caused a critcal error and shut down 2017-01-07 01:03:46 -05:00
Aurorablade 0e35706c00 damn.... 2017-01-06 23:32:17 -05:00
Fox McCloud 7de4280755 Merge pull request #6052 from Crazylemon64/morguelights
Morgue trays now have descriptions that correspond to their contents
2017-01-06 12:45:15 -05:00
Crazy Lemon af0c8e888a Merge pull request #4392 from Aurorablade/BookClub
Book Club Refactor/butchering
2017-01-06 05:55:01 -08:00
Fox McCloud 4f86cee581 Merge pull request #6053 from Crazylemon64/secure_buckles
Shuttles no longer disable buckling
2017-01-06 08:14:22 -05: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 ff91d4818a Picky nits 2017-01-01 21:53:31 -08:00
Crazylemon64 d79c42fa1e Shifts the checking procs to appropriate regions 2017-01-01 21:46:55 -08:00
Crazylemon64 27ada86bfa Morgue trays now have descriptions that correspond to their contents 2016-12-31 21:45:07 -08:00
Crazylemon64 f954382619 Adds a ui_key arg to ui_data 2016-12-31 12:51:07 -08:00
Aurorablade fc71122914 fixes
Barring any errent merge conflict fixing fuckery.
2016-12-29 11:39:18 -05: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 dd75048969 well hopefully last conflict fix with shuttle merger 2016-12-29 10:33:48 -05:00
Aurorablade e25ddf8329 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI 2016-12-24 00:18:40 -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 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
Crazy Lemon cf2f02e2c6 Merge pull request #5985 from Fox-McCloud/wall-rot
Wall Rot Effect Refactor
2016-12-21 17:43:45 -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 4b1bfe33ff Wall Rot Effect Refactor 2016-12-14 13:12:10 -05:00
Aurorablade 0bb62ebb36 everything works thanks to our tiger overlords.. 2016-12-12 23:59:37 -05:00
Kyep 49956eb241 Tiger request 2016-12-10 16:58:54 -08:00
Kyep 440d9fa3f2 Fixes xenomorph walls taking damage from disablers 2016-12-09 23:10:28 -08:00
Markolie 3a4e26f818 False walls now block atmos 2016-12-06 22:36:22 +01: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
Aurorablade fa1aa894ea Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-12-01 18:04:07 -05:00