cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-20 23:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,527 Commits 26 Branches 2 Tags
288af9f92cb15d93b0956a8b32b2f47ebb0dfd93
Commit Graph

22686 Commits

Author SHA1 Message Date
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
TheDZD
1184daba8d Merge pull request #4979 from Fox-McCloud/pai-turrets 
pAIs No Longer valid Gun Turret Targets
 2016-07-11 20:48:19 -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
TullyBurnalot
1105514f17 Revamps AI Integrity EMP'ing 
- AI Integrity Restorer can no longer be broken if EMP'd;
- AIs inside AI Integrity Restorers suffer 200 Brute Damage if the
Restorer is hit by an EMP
- If the AI Integrity Restorer is hit by an EMP, the restoration process
is stopped and the AI takes 200 Brute Loss
 2016-07-12 00:08:56 +01:00
TheDZD
b0dcb4ef25 Merge pull request #4989 from Fox-McCloud/borg-attack-fix 
Fixes Borg Stun Arm Bypassing Shields
 2016-07-11 19:01:12 -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
Fox McCloud
66b35d649d Merge pull request #4983 from DaveTheHeadcrab/wingler_fluff 
Jay Wingler Fluff Item
 2016-07-11 17:34:54 -04:00
TullyBurnalot
1bd63b62d2 Target list no longer uses living_mob_list 
It's now, instead, just a regular list.
 2016-07-11 20:01:30 +01:00
Mieszko Jędrzejczak
4751e0988c Fixes pulse shot cost. 2016-07-11 19:52:24 +02:00
SamCroswell
963ca2ca79 ACTUALLY Resolves The Merge Conflicts (Remember To Save, Kids) 2016-07-11 13:06:40 -04:00
SamCroswell
d79302ede6 Merge Conflict Resolution 2016-07-11 13:04:30 -04:00
Fox-McCloud
88468d2698 Fixes Borg Stun Arm Bypassing Shields 2016-07-11 10:45:50 -04:00
Fox-McCloud
b7c71c7c76 differences 2016-07-11 09:23:43 -04:00
Fox-McCloud
f0f229dc8b tweak 2016-07-11 07:07:31 -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
Fox McCloud
c75de17aef Merge pull request #4916 from Ar3nn/newscasterfuckoff 
Adds silence button to newscasters
 2016-07-11 02:38:24 -04:00
Fox-McCloud
943eb9b6dc grammar 2016-07-11 02:19:24 -04:00
SamCroswell
e84ebcbca7 Jay Wingler Fluff Item 2016-07-11 01:53:52 -04:00
Ar3nn
45d15dd360 !silence! 2016-07-10 20:55:35 -04:00
Fox-McCloud
762ed61881 Adds in Rathen's Secret 2016-07-10 20:04:17 -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
Fox-McCloud
b95dca4b3a pAIs No Longer valid Gun Turret Targets 2016-07-10 17:01:30 -04:00
Krausus
be7e466c08 Actually fixes alternate appearances 
This time, for real.
Also, some other minor tweaks.
 2016-07-10 16:53:04 -04:00
Ar3nn
f32e7d1bea Removed redundant src. 2016-07-10 16:44:12 -04:00
Fox McCloud
a8da06536c Merge pull request #4977 from FlattestGuitar/grenade-launchers 
Fixes the m90 grenade launcher.
 2016-07-10 15:51:08 -04:00
Mieszko Jędrzejczak
593aaee243 :^] 2016-07-10 21:43:56 +02:00
Fox McCloud
a61a2bdb53 Merge pull request #4973 from monster860/health_scanner_fix 
Fixes health scanner not having closing tag on it
 2016-07-10 15:38:54 -04:00
Fox McCloud
7fad1c9479 Merge pull request #4976 from monster860/alert_fix 
Fixes #4974
 2016-07-10 15:38:33 -04:00
monster860
dfcb4ce1d1 Fixes alerts 2016-07-10 15:30:36 -04:00
Fox-McCloud
4ac9c2aec4 commented code 2016-07-10 15:29:43 -04:00
Fox-McCloud
a23ca1ae88 Cinematic Fix and Relative Pathing 2016-07-10 15:20:13 -04:00
monster860
3552ed9608 Fixes health scanner not having closing tag on it 2016-07-10 14:38:09 -04:00
TheDZD
a97f0eaeea Merge pull request #4952 from Fox-McCloud/borg-power 
Borg Power Use Refactor
 2016-07-10 14:23:37 -04:00
Ar3nn
287007e33c All done, the button works 2016-07-10 12:15:53 -04:00
monster860
009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00