cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 12:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,880 Commits 26 Branches 2 Tags
a7d027cef6ea78257697223187777e00a0822674
Commit Graph

17012 Commits

Author SHA1 Message Date
Aurorablade
a7d027cef6 mrowl 2018-03-03 23:39:35 -05:00
Aurorablade
0e558f5b51 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BuffsVulpkanin 2018-03-01 19:55:48 -05:00
tigercat2000
b8b5795636 Merge pull request #8704 from Aurorablade/SkrellHair 
New hair for Skrell and one for Taja
 2018-02-24 19:19:23 -08:00
Aurorablade
86f25c5e7f fixes some words... 2018-02-21 23:31:43 -05:00
Fox McCloud
010d8d5eca Merge pull request #8651 from uraniummeltdown/titaniummineral 
Titanium
 2018-02-21 03:20:20 -05:00
Aurorablade
63537a050b new hair 2018-02-21 01:36:17 -05:00
uraniummeltdown
edda7c9c52 make power tools and abductor tools use titanium 2018-02-21 11:09:47 +05:00
Fox McCloud
d028ad1ee9 Merge pull request #8314 from Anasari/FireFight 
Port Paper Plane
 2018-02-20 21:12:21 -05:00
Ansari
1e0a4645db fix 2018-02-21 08:28:26 +08:00
Ansari
0acc32b103 Finally 2018-02-20 19:47:09 +08:00
Fox McCloud
6c7ab652a2 Merge pull request #8667 from Birdtalon/papertime 
Time tag for paperwork
 2018-02-20 06:00:11 -05:00
Fox McCloud
e4678d1a9f Merge pull request #8568 from MarcellusPye/SulphAcidNoMore 
Lets grays drink sulphuric acid
 2018-02-20 04:16:11 -05:00
Ansari
b3968ce180 woops 2018-02-20 16:11:42 +08:00
Ansari
bcdc6af7f1 Fixes 2018-02-20 16:08:49 +08:00
MarcellusPye
a426b93a7a Maintainer corrected comments 2018-02-20 19:45:57 +13:00
MarcellusPye
8235d8ec89 Calls parent 2018-02-20 19:38:55 +13:00
tigercat2000
f73c3c01d8 Merge pull request #8418 from Fox-McCloud/disco-inferno 
Adds Dance Machine
 2018-02-19 22:04:01 -08:00
Fox McCloud
0f0f7e13c6 Merge pull request #8444 from HugoLuman/whalecough 
Adds coughing and sneezing sounds for Drask
 2018-02-20 00:48:09 -05:00
tigercat2000
ff06bf8854 Merge pull request #8430 from Fox-McCloud/ied-buff 
Buffs IEDs
 2018-02-19 21:45:05 -08:00
florodude
4376f8f974 fixes #8680 
Changed frabricated to fabricated.
 2018-02-15 00:05:36 -06: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
Birdtalon
5e81b2f79f updates helper tooltip 2018-02-09 12:25:13 +00: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
uraniummeltdown
369c654c70 moves material defines to construction.dm 
adds the titanium mineral, titanium [false]walls, titanium floors, titanium airlocks
adds plastitanium, plastitanium [false]walls, plastitanium floor
made survival pod wall a subtype of titanium wall
changes a few rnd recipes to use titanium
small refactor of ORM code, smelt titanium+plasma to plastitanium
shuttle windows have explosion block 3
 2018-02-06 01:24:36 +05: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
Ansari
b6dae90f89 Fixes some problems, etc. 2018-02-03 12:35:42 +08: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