cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-31 12:41:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,949 Commits 26 Branches 2 Tags
d02165e0f94de2c4a9399a8699cc355da4f8a329
Commit Graph

1776 Commits

Author SHA1 Message Date
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Fox McCloud
433dde874a Merge pull request #3668 from Tastyfish/frames 
Adds picture frames
 2016-02-24 02:02:42 -05:00
Aurorablade
bbac4006b5 fixc all the things. 2016-02-23 02:48:13 -05:00
Tastyfish
02d7c20778 Makes soap & rags not starting a cleaning timer everytime you erase a pixel in canvas 2016-02-22 22:03:34 -05:00
Tastyfish
eff33023d0 Adds canvas support to picture frames 2016-02-22 20:24:57 -05:00
Fox McCloud
29784c9875 Merge pull request #3650 from TheBeoni/Sandals 
Adds new sandals.
 2016-02-21 19:26:42 -05:00
Aurorablade
2c38d8fb61 yeah 2016-02-21 05:54:10 -05:00
VampyrBytes
386ed87126 refactors washing items 
fixes #3570
Could have fixed with another if statement in sink/attackby, but it was
already pretty snowflakey, and had the potential to get worse
Items now have a wash proc that the sink calls, that can be overridden
when needed
 2016-02-20 12:01:40 +00:00
TheBeoni
156acacb4d Removed sec hailer 2016-02-20 12:43:44 +01:00
TheBeoni
bf7fcec275 Corrected. 2016-02-20 12:33:57 +01:00
TheBeoni
ce0f5a962a Adds new types of sandals. 2016-02-20 02:56:26 +01:00
Tastyfish
b56f9ed17f Fixes MetaStation directional signs 2016-02-18 22:37:04 -05:00
Aurorablade
570dd619b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-18 19:01:41 -05:00
FalseIncarnate
0015eac2c8 Arcade Prize Counter 2016-02-14 01:58:36 -05:00
FalseIncarnate
954d0dadfa Prize Counter WIP commit 2016-02-12 00:32:21 -05:00
Aurorablade
545d3abf19 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-11 18:03:09 -05:00
Tastyfish
13cf94c2f3 herp 2016-02-09 01:58:17 -05:00
Tastyfish
ca5d48487f Fixed tables... again 2016-02-09 01:09:32 -05:00
Fox-McCloud
fec86a78e4 as requested 2016-02-06 03:01:45 -05:00
Fox-McCloud
2e244feb0c Sink and Toilet Fixes 2016-02-06 01:25:52 -05:00
Aurorablade
25876fd036 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-02 15:35:54 -05:00
KasparoVy
aa4e1eb970 Sharing is Caring: Masks Galore 
Adds Vox versions of the Officer SWAT sechailer + HOS SWAT sechailer + Warden SWAT sechailer.

Adds versions of the following, re-sprited to fit Unathi, Tajara and Vulpkanin:

    Balaclava, up and down state
    All bandana colours (+ skull pattern), up and down states
    Breath mask, up and down state
    Clown mask+wig
    Cyborg mask
    Death Commando mask
    Gas mask
    All wrestling masks
    Medical mask, up and down state
    Mime mask
    Owl mask
    Plague doctor mask
    Ninja mask
    Sechailer, up and down state
    Sexy Clown mask+wig
    Sexy Mime mask+wig
    Sterile/Surgical mask, up and down state
    SWAT mask
    Welding gas mask, visor up and down state
    Officer SWAT sechailer + HOS SWAT sechailer + Warden SWAT sechailer
    All smokeables re-positioned so non-humans aren't smoking through their cheek.

Also fixes some typos, does a tiny bit of cleaning and gives the Warden their sechailer.
The sprite was just laying around, it seems.
 2016-02-01 17:49:37 -05:00
Aurorablade
b2881bdc94 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-26 21:17:25 -05:00
KasparoVy
cf005e9987 Readds black beret to locker, gives it armour. 2016-01-25 02:08:38 -05:00
KasparoVy
5e4a2b5dea Blueshield Beret Tweak 
Adds a navy blue version of the Centcom Officer's beret, giving it to
the Blueshield.

Gives the Blueshield beret the exact same armour and strip-delay values
as the SECURITY OFFICER'S beret.
 2016-01-24 22:48:10 -05:00
TheDZD
eca90c1321 Merge pull request #3334 from Fox-McCloud/knight-armor 
Ports Knight Armor
 2016-01-23 17:51:51 -05:00
Fox-McCloud
7d30c5aa8f chaplain closet 2016-01-23 07:57:30 -05:00
Tastyfish
4c6a8b49e9 Fixed table placing messing up adjacent flipped tables 2016-01-22 12:01:03 -05:00
Fox-McCloud
a5622a230f Ports Knight Armor 2016-01-22 07:14:55 -05:00
Aurorablade
95dca71432 Merge branch 'OrganRefactor' of https://github.com/Aurorablade/Paradise; branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-21 21:11:26 -05:00
Tastyfish
2406f7f432 Fixes table flipping graphics 2016-01-20 03:41:09 -05:00
TheDZD
b1e6f7c0a8 Merge pull request #3157 from DaveTheHeadcrab/blueshitgun 
Blueshield: Advanced Stun Revolver
 2016-01-16 23:17:54 -05:00
Jey
189ac6f4e6 -small change 2016-01-15 14:10:47 -05:00
Jey
6002ec00e1 simple quality of life tweak to the inflatable walls / doors. 
Alt-click on an inflated one to deflate (same as the deflate option on right click)
 2016-01-15 13:19:18 -05:00
Aurorablade
51013b97c0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-15 08:10:24 -05:00
Fox-McCloud
eb5fcba6c5 Explosion Overhaul 2016-01-12 18:46:10 -05:00
SamCroswell
134e507ee6 Asset Protection Energy Gun 2016-01-08 00:27:51 -05:00
Fox McCloud
96f38d0ccd Merge pull request #3120 from Tastyfish/nano-piano 
Instrument UI updated to modern nanoui.
 2016-01-06 03:45:43 -05:00
TheDZD
3d316d9c66 Merge pull request #3116 from Fox-McCloud/slipping-floors 
Slippery Refactor and Floors
 2016-01-05 21:42:26 -05:00
TheDZD
73f6114b1f Merge pull request #3112 from Fox-McCloud/object-verb-restore 
Restores a Few Object Verbs
 2016-01-05 19:35:55 -05:00
Tastyfish
65e2a7fdff Updates/fixes instrument ui to be a nanoui 2016-01-05 02:26:45 -05:00
Fox-McCloud
4221d033ab Slipping Refactor and Floors 2016-01-04 21:22:59 -05:00
Fox-McCloud
b69eb0a408 better checks and fingerprints 2016-01-04 16:53:35 -05:00
Fox-McCloud
a7d1bcce4e Restores a Few Object Verbs 2016-01-04 16:42:53 -05:00
Fox-McCloud
38149bfc7d Merge remote-tracking branch 'upstream/master' into sec-rifle 2016-01-03 22:35:28 -05:00
Fox McCloud
9c863e5259 Merge pull request #3092 from tigercat2000/tgsmooth 
-tg- Smoothing/Floor refactor
 2016-01-03 22:28:50 -05:00
Tigercat2000
31aab5452b -tg- smoothing/floor refactor 
Squashed:

Add plasteel goonplaque turf

Builtin_tile nulling

Levelupdate()

Fix falsewalls, update smoothing.dmm

fixes rwall decon
 2016-01-03 19:24:13 -08:00
Fox-McCloud
e9d5c67371 securer crates 2016-01-03 21:02:48 -05:00
Fox-McCloud
0bb97a1636 Table Pushing Refactor+Fix 2016-01-03 02:12:31 -05:00
Aurorablade
bd19dc6942 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-01 22:38:23 -05:00