cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 17:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,799 Commits 26 Branches 2 Tags
c08188ce4edd2f1d5eabb391d25d09aee0481110
Commit Graph

16975 Commits

Author SHA1 Message Date
Kyep
c08188ce4e more spiderling updates 2018-02-16 01:26:33 -08:00
Kyep
5c84b0a833 green event -> spawn 5 2018-02-16 01:18:28 -08:00
Kyep
3fe2594a60 maintain constant white/brown/purple forces 2018-02-16 01:08:08 -08:00
Kyep
a19c4ab241 rm white, ready room tweaks, black jump, airlock fix 2018-02-15 23:46:54 -08:00
Kyep
240850bcea Tweaks 2018-02-11 17:55:37 -08:00
Kyep
18a1be627f Fixes merge conflict 2018-02-11 17:52:00 -08:00
Kyep
7fa132560c New sprite, better AI 2018-02-11 17:48:17 -08:00
Crazy Lemon
8979e2428d Merge pull request #8410 from tigercat2000/client_dir 
Client dir compatibility, part 1
 2018-02-11 16:40:44 -08:00
Fox McCloud
571f86c7f0 Merge pull request #8277 from Aurorablade/DisMemberments 
Adds to Dismemberment slightly
 2018-02-10 00:27:12 -05:00
Aurorablade
37f2b8f010 Allows castration 2018-02-09 20:18:04 -05:00
tigercat2000
bd50420a50 Merge pull request #8664 from RyanSmake/muhspessnamez 
We don't need 5 separate variables to know which station we are on, take two
 2018-02-09 13:18:22 -08:00
Bxil
cdf25e8577 No holidays fer u 2018-02-09 08:20:21 +01:00
Bxil
434cbfdb27 Cargo shuttle station name 2018-02-09 07:53:12 +01:00
Aurorablade
acc2547e38 its works 2018-02-08 22:42:34 -05:00
Aurorablade
f4a18ef044 Fixed 2018-02-08 13:36:43 -05:00
Birdtalon
8623fbec73 adds condition to prevent chugging of unopened containers 2018-02-08 14:48:33 +00:00
Aurorablade
56122116c5 well now its just not working at all 2018-02-08 04:01:45 -05:00
Aurorablade
148b4545aa this is still wrong... 2018-02-08 03:05:09 -05:00
Aurorablade
20ddaccb9b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DisMemberments 2018-02-08 02:31:44 -05:00
Aurorablade
1f59e61bc9 I got to test this in a sec... 2018-02-08 02:31:30 -05:00
tigercat2000
62609fd37c Merge pull request #8648 from Aurorablade/FUCKAGAIN 
medhud fixes
 2018-02-05 17:37:06 -08:00
tigercat2000
93610061e0 Merge pull request #8590 from IK3I/RiseOfSpork 
The Utensil of the future!
 2018-02-05 12:49:59 -08:00
tigercat2000
ee894f887a Merge pull request #8556 from Tayyyyyyy/glowing_eswords 
Esword visual update
 2018-02-05 12:49:42 -08:00
tigercat2000
7e8dbfcb34 Merge pull request #8589 from MarsM0nd/lock_with_lock 
Fixes pod lock buster
 2018-02-05 12:12:16 -08:00
Aurorablade
2921d35037 fixed it. 2018-02-04 21:19:22 -05:00
Aurorablade
ddfde7c6fd urgh still not working 2018-02-04 21:01:21 -05:00
Aurorablade
235deac64a medhud fixes 2018-02-04 20:17:09 -05:00
Aurorablade
2980b37eba removes debug line 2018-02-02 01:48:51 -05:00
Aurorablade
061cbcfaf2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into MOREDOTS 2018-02-02 01:26:12 -05:00
Aurorablade
cbc446a479 it works tiger pants 2018-02-02 00:31:19 -05:00
tigercat2000
ebe366fd67 Merge pull request #8403 from Aurorablade/FollowThePath 
Ports some hud updates from TG
 2018-02-01 19:56:51 -08:00
Aurorablade
8e3b031e79 tigers suggestion 2018-02-01 18:23:11 -05:00
tigercat2000
0da85e6bb3 Merge pull request #8433 from Tayyyyyyy/maint_drones 
Players job banned from syndicate can no longer play emagged drones
 2018-02-01 08:19:50 -08:00
tigercat2000
d8a00048bd Merge pull request #8424 from uraniummeltdown/airlockoverlay 
Airlock Overlays + Tweaks
 2018-02-01 08:19:24 -08:00
tigercat2000
04172bddf4 Merge pull request #8416 from Fox-McCloud/xenobio-console-change 
Slime Blueprint Change
 2018-01-29 18:38:16 -08:00
tigercat2000
c998400ce8 Merge pull request #8619 from MarcellusPye/GhostPrefs 
Fixes #8474
 2018-01-29 14:18:34 -08:00
MarcellusPye
1d92b126fc Inital fix 2018-01-30 00:45:43 +13:00
tigercat2000
8eb039894a Merge pull request #8601 from alexkar598/bye_bye_old_code 
Removes some old unused code
 2018-01-27 16:15:09 -08:00
uraniummeltdown
a3a0e83908 adds sql update file 
fixes clientfps not saving
 2018-01-27 23:24:45 +05:00
tigercat2000
085c6b7961 Merge remote-tracking branch 'upstream/master' into client_dir 
# Conflicts:
#	icons/turf/walls/rusty_reinforced_wall.dmi
 2018-01-27 09:10:39 -08:00
Fox McCloud
9339289249 Merge pull request #8602 from tigercat2000/modvars_tigersadumbass 
Add another step_ variable to the warning list....
 2018-01-26 16:47:55 -05:00
Fox McCloud
1445510c77 Merge pull request #8604 from tigercat2000/movement_delta 
Movement delay is no longer rounded to the tick
 2018-01-26 16:46:17 -05:00
tigercat2000
182d429534 Merge pull request #8596 from Tayyyyyyy/emitter_beam_fix 
Oops. Emitter beams should have a green glow
 2018-01-26 13:04:58 -08:00
tigercat2000
65130b3fc0 Movement delay is no longer rounded to the tick 2018-01-26 12:58:47 -08:00
tigercat2000
b885573076 Add another step_ variable to the warning list.... 2018-01-26 12:34:48 -08:00
alexkar598
3bf4ffcc62 DIE OLD CODE,DIE! 2018-01-26 13:50:56 -05:00
tigercat2000
b42109210b Merge pull request #8598 from FreeStylaLT/sneaky_mins 
Prevents mentors from seeing stealthed admins
 2018-01-25 23:22:31 -08:00
tigercat2000
b1e05d53da Merge pull request #8593 from uraniummeltdown/60fps 
Makes Paradise 60 FPS
 2018-01-25 22:34:31 -08:00
FreeStylaLT
9d3b7f50b4 Prevents mentors from seeing stealthed admins 2018-01-25 16:11:13 +02:00
Tayyyyyyy
e720a2b4a6 Oops. Emitter beams should have a green glow 2018-01-25 00:52:24 -06:00