cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 17:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,172 Commits 29 Branches 2 Tags
cedfc2ccbfaca3e92d74bfbfd714d3c060d8fdcb
Commit Graph

321 Commits

Author SHA1 Message Date
Crazy Lemon
eb07245894 Merge pull request #6027 from KasparoVy/le-film-noir-est-fini 
Returns Colour Vision when you Unequip Noir Glasses
 2016-12-29 18:57:03 -08:00
KasparoVy
0ec94ab50e Improves maintainability of Noir Glasses. 2016-12-25 00:49:46 -05:00
Aurorablade
e25ddf8329 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI 2016-12-24 00:18:40 -05: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
a80b0feae1 Merge pull request #5879 from KasparoVy/glasses_handling_properly 
Adds switch-layer rendering functionality for f.hair, glasses and head accessories.
 2016-12-09 18:22:27 -05:00
Fox McCloud
1c43121f30 Merge pull request #5954 from Markolie/aieye 
[s]Prevents AI units from clicking on things they can't see
 2016-12-07 10:49:36 -05:00
Markolie
b1a4195b40 Fix up \ref's 2016-12-07 07:53:20 +01:00
Aurorablade
19925a3313 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI 2016-12-06 21:22:16 -05:00
Markolie
73af7f94b8 Prevents AI units from clicking on things they can't see 2016-12-06 13:13:46 +01:00
Aurorablade
2dc1a48f35 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-12-01 22:38:35 -05:00
Fox-McCloud
c70e69004c Timer Controller Update 2016-11-30 17:50:16 -05:00
KasparoVy
71bf84b4a9 Merge remote-tracking branch 'upstream/master' into glasses_handling_properly 2016-11-29 17:34:10 -05:00
Tigercat2000
8ae9bb457c Merge remote-tracking branch 'upstream/master' into patreon 
# Conflicts:
#	code/__DEFINES/misc.dm
 2016-11-26 16:48:07 -08:00
KasparoVy
64a2e876a7 Adds switch-layer rendering functionality for facial hair, glasses and head accessories. Glasses will now overlay hair only in certain circumstances. 
Hair that is short (has glasses_over set) will have glasses rendered on top of it rather than the default behaviour of below it.
 2016-11-12 12:08:45 -05:00
Tigercat2000
e997207d1f Patreon Modifications 
- Adds a `donators` table for our patreon supporters.
   - Intended to be half-automated, half-manual, in order to correlate
     patreon accounts to ckeys. Uses the `active` field so that supporters
     don't have to have their ckey associated every time they stop and
     restart their donations.
 - Current actions:
   - Donators at tier 1 or greater get a palm tree next to their name in OOC
     (toggleable)
   - Donators at tier 1 or greater get +5 loadout points.
     - Known issue: Loadout points will not update if the table is
       modified during a round where the user has already logged in, due
       to preference datum caching. There's not really any good way to fix
       this, unfortunately.
 2016-11-11 08:29:15 -08:00
Mark van Alphen
4ae1855a64 Reduce cooldown to 0.5 seconds 2016-11-09 07:46:38 +01:00
Markolie
30f5874ca8 Reduce the cooldown to 1 second 2016-11-08 18:08:52 +01:00
Markolie
75176722e7 Add OOC throttling 2016-11-08 17:01:44 +01: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
Aurorablade
01f4e64f12 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-10-12 20:37:09 -04:00
TheDZD
568e648bfb Merge pull request #5581 from Fox-McCloud/cloning-update 
Cloning Update
 2016-10-11 16:51:34 -04:00
Aurorablade
864a9ba612 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-10-07 23:51:48 -04:00
Aurorablade
ee1482b9b2 THE HACKS HURTS US PRECIOUS 2016-09-27 01:06:48 -04:00
Mieszko Jędrzejczak
56d56ffe7f ckeyless humans don't get to be shot 2016-09-26 17:43:57 +02:00
Aurorablade
2b19b81b99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-09-17 01:38:02 -04:00
Fox-McCloud
cffd88ee8a Merge remote-tracking branch 'upstream/master' into cloning-update 2016-09-05 18:31:18 -04:00
KasparoVy
1373070b98 More Conflict Resolution 2016-09-03 21:29:10 -04:00
TheDZD
f351e40f0c Makes shields counter xeno leap more effectively 2016-09-01 11:34:00 -04:00
Fox-McCloud
bc7f3c67a6 Cloning Update 2016-08-31 01:48:02 -04:00
Aurorablade
65d1c781c8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-08-26 21:54:56 -04:00
Fox McCloud
4f590f27c4 Merge pull request #5537 from Crazylemon64/debug_log_to_error_viewing 
Moves from `log_debug` to `log_runtime` for non-fatal abberant states
 2016-08-26 21:15:31 -04:00
KasparoVy
cd9b12086b Merge remote-tracking branch 'upstream/master' into repathing-sprite-accessories 2016-08-26 02:28:47 -04:00
Crazylemon64
16dd4e9d21 Moves many uses of log_to_dd to log_runtime, to make the output 
more visible at runtime, to someone who isn't watching DD first-hand
 2016-08-24 09:55:19 -07:00
Crazylemon64
03b7d1b3a9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_transition_runtime_fix 2016-08-23 13:41:39 -07:00
TheDZD
01e3aef4a3 Merge pull request #5524 from Crazylemon64/recycler_contents_fix 
Fixes a runtime when a recycler eats something containing other stuff
 2016-08-23 14:07:57 -04:00
Crazylemon64
5b20506b02 Replaces qdeleted with a cleaner macro 2016-08-22 23:49:33 -07:00
Crazylemon64
bf2a895658 Makes space transition checks more consistent 
Fixes a runtime on map start due to not having updated all the border
definitions all at once - the new defines will now resolve this.
 2016-08-22 19:46:23 -07:00
Fox-McCloud
8cd6e58c07 updates 2016-08-21 11:44:54 -04:00
KasparoVy
9bc614a28e Conflict resolution and adds sanitization to marking SQL handling. 2016-08-21 00:01:12 -04:00
Fox McCloud
7d9770f59d Merge pull request #5486 from TheDZD/genetics2 
Genetic Instability Refactor & Minor Genetics Rebalance
 2016-08-19 20:11:46 -04:00
TheDZD
610c10977f Merge pull request #5482 from Fox-McCloud/kinetic-smasher 
Kinetic Crusher
 2016-08-19 20:11:28 -04:00
KasparoVy
ab3f71b359 Conflict resolution again 2016-08-19 01:08:08 -04:00
TheDZD
fda0953f03 Minor genetic instability refactor & minor genetics rebalance 2016-08-18 15:01:19 -04:00
KasparoVy
29a90bff9f Conflict resolution. 2016-08-18 03:28:03 -04:00
Fox-McCloud
5c783f2110 fixup 2016-08-18 00:09:57 -04:00
Krausus
541076b6b4 Conflict resolution 2016-08-17 22:54:22 -04:00
Fox-McCloud
1f364c1bcf Kinetic Smasher 2016-08-17 20:31:37 -04:00
Fox-McCloud
71d862cabd Merge remote-tracking branch 'upstream/master' into strips-out-media 2016-08-17 17:46:26 -04:00
KasparoVy
e0bfbd0af6 Keeping up to date. 2016-08-17 02:56:34 -04:00
Krausus
4478855cfd Process deferral and profiling improvements 2016-08-17 02:10:39 -04:00