cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-09 17:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,856 Commits 26 Branches 2 Tags
2abbbc7a40345a80bbb116f384f68a6b63766ac2
Commit Graph

1139 Commits

Author SHA1 Message Date
FlimFlamm
2abbbc7a40 This commit removes the loop used to check contents and instead uses W.contents.len in order to compare the ccurrent number of items in the crayon box against it's max storage capacity (6) to ensure the crayon box is full. Also better usage of returns in order to preserve indentation on code and make it more readable. 2017-02-08 10:08:07 -04:00
FlimFlamm
47427c5aec This commit adds checks to make sure the box is filled with 6 crayons (of any subtype) before the input selection window is presented, and after a choice is made (to prevent people using crayon-less boxes) 2017-02-08 00:26:26 -04:00
FlimFlamm
6ede4c9ef8 This commit improves again the legibility of the list of decal options presented to the user, fixes a minor syntactical error involving ampersands, and deletes superfluous returns at the end of attackby proc. 2017-02-07 03:22:29 -04:00
FlimFlamm
25f5df4ba3 This commit adds adjacency check, item-still-in-hands check, now properly handles null input, and consumes the crayon box upon completion. Everything compiles, and everything works on local environment. 2017-02-06 22:04:36 -04:00
FlimFlamm
4666222ab5 This commit adds a cancel option to the decal selection list and spruces up the names to make them more legible 2017-02-05 23:24:50 -04:00
FlimFlamm
d01e4c3023 readds a forward slash which was removed in error 2017-02-04 21:51:22 -04:00
FlimFlamm
7432e80d51 This commit modifies cardboardbox.dm in order to have boxes pull sprites from the ew DMI file, and also to trigger the re-spriting option when open boxes are struck with a box of crayons. 2017-02-04 16:25:42 -04:00
Chakirski
f39fe8ab75 muh future 2017-02-01 21:29:04 -06:00
Chakirski
812c2db2fe closets 2017-01-31 19:14:31 -06:00
fludd12
bb263d58c5 #JustAdminThings 2017-01-26 09:23:49 -05:00
fludd12
3cff59ec74 Adds Respawner 2017-01-26 05:09:44 -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
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
Fox McCloud
8b7ce46155 Merge pull request #5959 from Markolie/fixinwall 
False walls now block atmos
 2017-01-07 14:19:53 -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
Crazylemon64
ec0f13d41e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2017-01-06 05:01:43 -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
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
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
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
Markolie
3a4e26f818 False walls now block atmos 2016-12-06 22:36:22 +01: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
Fox McCloud
f205f5f040 Merge pull request #5915 from Twinmold93/runtime_fixer_t2 
Spacepod and Some Runtime Fixes
 2016-12-01 10:15:51 -05:00
Twinmold
ada80ec529 Pod Fixes and Some Runtime Fixes 
Fixes sending pod pilots to the void when the pod explodes/is destroyed,
as well as giving them damage warnings, just like passengers get. Also
fixes it so if a guardian traps something, then dies, doesn't runtime.
Lastly, fixes it so there isn't a randomly runtime from opening a
critter crate, as well as cleaning up a little snowflake code, thanks to
Crazylemon.
 2016-11-26 05:37:31 -06:00
Aurorablade
0c637cebfa Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub 2016-11-22 01:48:56 -05:00
Crazy Lemon
405fe1bb54 Merge pull request #5842 from Fox-McCloud/reagent-reorganization 
Reagent Reorganization
 2016-11-21 16:54:41 -08:00
Aurorablade
5d392b36a4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-11-15 15:30:36 -05:00
Fox McCloud
922091d786 Merge pull request #5885 from Markolie/grammarfix 
Grammar fix
 2016-11-13 19:00:21 -05:00
Markolie
f5c9ebc068 Grammar fix 2016-11-14 00:22:24 +01:00
TullyBurnalot
1955f86383 Fax Guide Removal 
- Removes Fax Guides from HoS and HoP Lockers
 2016-11-12 01:59:21 +00:00
Aurorablade
4b717c7712 BUILDABLE cult door... 2016-11-10 02:44:21 -05:00
Fox-McCloud
61da53cca1 create reagents proc 2016-11-06 14:37:47 -05:00
Aurorablade
23e392f0ef Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-31 22:38:14 -04:00
Fox McCloud
911fa70e1a Merge pull request #5601 from Crazylemon64/status_effect_overhaul 
Ports over the status effect unification from the extreme refactor
 2016-10-30 22:40:24 -04:00
Aurorablade
0a265f963c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-24 22:30:16 -04:00
Fox McCloud
45ba4d157a Merge pull request #5416 from KasparoVy/tail_markings_mark2 
Marking Refactor, Adds tail markings + Alt heads + Secondary (F)Hair themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
 2016-10-23 19:29:54 -04:00
Crazylemon64
6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
Markolie
3acde653d2 Fix cult girder layer 2016-10-21 18:04:00 +02:00
Aurorablade
e2ce799aa1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-08 22:21:48 -04:00
KasparoVy
3e653a6279 Conflict resolution. 2016-09-26 12:17:35 -04:00
Aurorablade
2b19b81b99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-09-17 01:38:02 -04:00
Fox McCloud
c56961f6f0 Merge pull request #5642 from Krausus/UniqueIDs 
Adds Unique Identifiers with Topic and VV Integration
 2016-09-12 15:32:20 -04:00