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
Aurorablade
2dc1a48f35
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI
2016-12-01 22:38:35 -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
Crazy Lemon
405fe1bb54
Merge pull request #5842 from Fox-McCloud/reagent-reorganization
...
Reagent Reorganization
2016-11-21 16:54:41 -08: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
Fox-McCloud
61da53cca1
create reagents proc
2016-11-06 14:37:47 -05: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
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
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
GeneralChaos81
c5e9b0514f
Redo of clown/mime door fix.
2016-09-12 20:11:54 +10:00
Krausus
92405288d2
UID mass replace: src=\ref[src]
2016-09-05 23:02:10 -04:00
KasparoVy
1373070b98
More Conflict Resolution
2016-09-03 21:29:10 -04:00
uraniummeltdown
aac3fa245d
added absolute paths
2016-09-03 09:15:30 +04:00
uraniummeltdown
92fc9d79f4
removed access requirements
2016-09-02 08:24:21 +04:00
uraniummeltdown
7eac0d4d8a
added mime and clown lockers to code, added sprites
2016-09-01 21:43:49 +04:00
Aurorablade
0bfd0ae876
cultdoors
2016-09-01 01:26:59 -04:00
TheDZD
f5577b4a8f
add_logs() un-fuckery
2016-08-29 17:27:56 -04:00
KasparoVy
1c407a36a1
Sorts out some runtimes, adds randomization for a bunch more stuff in character preferences, adds species validation to undergarments, adds absolute pathing to sprite_accessories and repaths alot of stuff.
...
Also corrects some oversights.
2016-08-27 09:22:01 -04:00
Crazylemon64
05ebb18b3d
Fixes a closet runtime
2016-08-22 22:14:31 -07:00
Krausus
ae0f60c06b
Makes girders non-bulletproof
...
Also, minor refactoring
2016-08-21 11:12:48 -04:00
Isaac Erwin
8b9b28a3c5
Fixes welded fireclosets not showing up properly
2016-08-13 13:14:30 -04:00
monster860
19460ff4af
Makes boldnotice and danger classes be be used
2016-08-11 12:20:02 -04:00
TheDZD
6d280e52de
Merge pull request #5375 from Fox-McCloud/formal-captain
...
Formal Captain Update
2016-08-10 18:12:09 -04:00
Fox-McCloud
989b629de4
crown and shoes
2016-08-08 19:36:41 -04:00
Fox-McCloud
0694a35da4
Formal Captain Update
2016-08-08 19:01:37 -04:00
Crazylemon64
031dd2bb3d
Iiiiit's merge conflict time!
...
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
2016-08-07 23:42:02 -07:00
TheDZD
44ae3a4a68
Merge pull request #5309 from Fox-McCloud/field-generators
...
Field Generator Cleanup, Singularity Fixes,
2016-08-03 23:29:09 -04:00
Krausus
c8989b36e1
Fixes cremation of self-deleting mobs
2016-08-03 19:21:36 -04:00
Fox-McCloud
5533c36af3
Field Generator Cleanup, Singularity Fixes,
2016-08-03 17:17:04 -04:00
Crazylemon64
7db4094a38
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
2016-08-03 13:31:42 -07:00
Crazylemon64
6ca037d9f4
Makes things more consistent
2016-08-02 11:27:28 -07:00
Fox McCloud
9ffc341f49
Merge pull request #5274 from TheBeoni/Coats
...
Removes the obligatory tie from Blueshields and Detectives coat.
2016-08-02 13:48:13 -04:00
Fox McCloud
db066016b2
Merge pull request #5273 from LittleBigKid2000/mourning-wood
...
Fixes wooden coffins deconstructing into metal sheets
2016-08-02 12:56:33 -04:00
Fox McCloud
dbd1cdb35a
Merge pull request #5269 from GeneralChaos81/AtmosLockers
...
Unique sprites for Engineers and Atmos tech lockers and wardrobes.
2016-08-02 12:55:54 -04:00
Isaac Erwin
692e961e2f
Fixes wooden coffins deconstructing into metal sheets
...
Sure, I /could/ fix the messages and the fact that a wooden coffin is
deconstructed with a welder, but just think of it as slicing the hinges
apart because I'm too lazy.
Also makes sarcophaguses deconstruct into sandstone, but I don't think
I've ever seen those in-game.
🆑
fix: Coffins will now deconstruct into wood instead of metal.
/🆑
2016-08-01 23:05:50 -04:00
Crazylemon64
bc93078da5
Merge conflicts begone
2016-08-01 18:28:47 -07:00
TheDZD
0cc2051f8a
Merge pull request #5251 from Fox-McCloud/fire-system
...
Implements Fire System
2016-08-01 19:39:50 -04:00
TheBeoni
67836ab234
Adds black tie to detectives locker.
2016-08-01 22:12:16 +02:00
GeneralChaos81
7c7d63b05f
Unique sprites for Engineers and Atmos tech lockers and wardrobes.
2016-08-01 16:25:50 +10:00
