cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 23:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,024 Commits 26 Branches 2 Tags
1bcd366f5aa13ac6566fb730359301a5ee449783
Commit Graph

13682 Commits

Author SHA1 Message Date
Fox McCloud
1bcd366f5a Merge pull request #5042 from DaveTheHeadcrab/wingler_fluff 
Jay Wingler Fluff Item Fix
 2016-07-13 23:12:33 -04:00
SamCroswell
bb6b7bbf30 Minor Fix 2016-07-13 23:06:35 -04:00
SamCroswell
fb0e72cc84 Quick Fix 2016-07-13 23:01:01 -04:00
Fox McCloud
c03aebaed9 Merge pull request #5002 from Chakirski/holograms 
Ahh yes, "Reapers"
 2016-07-13 21:50:14 -04:00
TheDZD
bb71be600c Merge pull request #5006 from Fox-McCloud/fans 
Fantastic PR
 2016-07-13 21:48:10 -04:00
Fox McCloud
466eb8731a Merge pull request #5011 from TullyBurnalot/ButtEmag 
Adds Emagged Photocopier Cooldown
 2016-07-13 21:46:49 -04:00
TheDZD
0bedf9668b Merge pull request #5014 from Fox-McCloud/actual-fix 
Actually Fixes Medical, Security, and Employment Records
 2016-07-13 21:44:47 -04:00
monster860
717bdf79c0 ChemMaster fixes 2016-07-13 19:15:03 -04:00
Fox-McCloud
cb111fbec4 tweak 2016-07-13 19:14:57 -04:00
Chakirski
2911c89733 Fox you're krilling me! 2016-07-13 11:53:54 -05:00
Fox-McCloud
d8895b0ce9 Actually Fixes Medical, Security, and Employment Records 2016-07-13 05:08:44 -04:00
TullyBurnalot
ed1e6b1305 Adds Photocopier Cooldown when emagged 2016-07-13 04:25:58 +01:00
TheDZD
dd2390d9bb Merge pull request #4987 from Fox-McCloud/cyborg-tweaks 
Cyborg Upgrade Additions and Refactor
 2016-07-12 21:22:57 -04:00
Fox-McCloud
3acce26982 Fantastic PR 2016-07-12 18:21:02 -04:00
Fox McCloud
5dc65d9137 Merge pull request #4984 from Kyep/evilfax_cluwne 
Adds Cluwne EvilFax
 2016-07-12 17:14:50 -04:00
Fox McCloud
a6323e0bde Merge pull request #5003 from Tastyfish/pipecheck 
Fixes Check Piping verb
 2016-07-12 17:13:15 -04:00
Chakirski
304b861fd4 height 2016-07-12 11:19:48 -05:00
Chakirski
f8ce4ed19d Ahh yes, "Reapers" 2016-07-11 23:17:17 -05:00
Tastyfish
463fce5453 Fixes Check Piping verb 2016-07-12 00:10:31 -04:00
Fox McCloud
3934b9f841 Merge pull request #4841 from DaveTheHeadcrab/grey_speech_fix 
Grey Update
 2016-07-11 23:13:38 -04:00
SamCroswell
46954091e6 Minor Tweaks 2016-07-11 22:28:35 -04:00
Fox McCloud
b787af15f8 Merge pull request #4934 from Chakirski/BACON! 
Adds AUTHENTIC, JUICY, AMAZING BACON!
 2016-07-11 21:23:41 -04:00
Fox McCloud
c803c4f752 Merge pull request #4911 from Kyep/exile_option 
Makes Exile & Lethal Injection Viable
 2016-07-11 21:21:16 -04:00
TheDZD
5ba6e17739 Merge pull request #4917 from TullyBurnalot/BureaucracyUpdate 
Bureaucracy Update
 2016-07-11 21:20:06 -04:00
Chakirski
a031ebe889 Update snacks.dm 2016-07-11 20:17:30 -05:00
TheDZD
2b5e36b296 Merge pull request #4935 from Twinmold93/martialartsvampire 
The Sleeping Carp Vampires
 2016-07-11 21:10:57 -04:00
Fox McCloud
665fb967b2 Merge pull request #4961 from monster860/chemmaster-nanoui 
The Long-Requested Nano-UI-ification of the ChemMaster
 2016-07-11 21:02:25 -04:00
TheDZD
813f6f3778 Merge pull request #4962 from Fox-McCloud/ipc-change 
Removes IPC Firesuit Cheese
 2016-07-11 21:01:31 -04:00
TheDZD
960676d53b Merge pull request #4964 from Kyep/cryo_ghost 
Improves Cryoing
 2016-07-11 21:01:04 -04:00
TheDZD
66c8eb899e Merge pull request #4966 from Fox-McCloud/ntrep-cane 
Nanotrasen Rep Cane Tweak
 2016-07-11 20:59:34 -04:00
TheDZD
ca7530f58d Merge pull request #4968 from Fox-McCloud/blood-refactor 
Blood Refactor+Fixes
 2016-07-11 20:57:25 -04:00
TheDZD
6b047f1ac1 Merge pull request #4975 from Fox-McCloud/cinematic-fix 
Cinematic Fix and Relative Pathing
 2016-07-11 20:53:59 -04:00
TheDZD
2f9dab5f1e Merge pull request #4978 from Krausus/UhOhImSlowingDownAlternateAppearanceCodeAgain 
Actually Fixes Those Stupid Plants (By Fixing Alternate Appearances)
 2016-07-11 20:52:40 -04:00
Fox McCloud
374b682bf7 Merge pull request #4990 from FlattestGuitar/pulse-stuf 
Fixes pulse shot cost.
 2016-07-11 20:46:22 -04:00
Fox McCloud
595297fb6e Merge pull request #4991 from Krausus/ThereCanOnlyBeOneHookSystem 
Fixes Morgue Updating and Eliminates VG-style Hooks
 2016-07-11 20:41:32 -04:00
TheDZD
48ef42e6cc Merge pull request #5001 from LittleBigKid2000/master 
Fixes the brownstar reagent's description
 2016-07-11 20:08:02 -04:00
Isaac Erwin
2509969a65 Fixes the brownstar reagent's description 2016-07-11 19:48:16 -04:00
Tigercat2000
863595a512 krausy wai 2016-07-11 15:50:15 -07:00
Tigercat2000
15de192719 Metastation Fixes v5555555 
- Fixes a few missing pipes
 - Fixes the grav gen being horrifyingly mangled
 - Fixes runtimes on start because of decorative shuttle consoles
 2016-07-11 15:41:33 -07:00
Krausus
355fb3c080 Fixes morgue updating and removes VGhooks 2016-07-11 17:39:21 -04:00
Mieszko Jędrzejczak
4751e0988c Fixes pulse shot cost. 2016-07-11 19:52:24 +02:00
SamCroswell
d79302ede6 Merge Conflict Resolution 2016-07-11 13:04:30 -04:00
Fox-McCloud
b7c71c7c76 differences 2016-07-11 09:23:43 -04:00
Fox-McCloud
2a3ccf3729 Cyborg Upgrade Additions and Refactor 2016-07-11 06:16:44 -04:00
Kyep
e14f1b7529 Adds Cluwne EVILFAX 
Fox Changes

Fox Spacing
 2016-07-11 00:39:11 -07:00
SamCroswell
f5f6817a44 Inane Optimizations And General Pedantry 2016-07-11 02:42:28 -04:00
SamCroswell
e84ebcbca7 Jay Wingler Fluff Item 2016-07-11 01:53:52 -04:00
Chakirski
7635de3020 Sliceable cutlets are sliceable not sliceable 2016-07-10 18:22:32 -05:00
Fox McCloud
4fa956054c Merge pull request #4959 from TheDZD/salt-for-the-salt-god 
Adds "salts" to the Say Verbs for Deadchat
 2016-07-10 19:10:54 -04:00
Krausus
308c8a5667 Fixes alternate appearances right 
Still uses inefficient for loops in Login and Destroy, though~
 2016-07-10 17:56:53 -04:00