cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 07:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,665 Commits 26 Branches 2 Tags
2cff4b35c5cc49cb82f75dc194bb5e29f319475b
Commit Graph

19113 Commits

Author SHA1 Message Date
variableundefined
2cff4b35c5 Merge pull request #10777 from Kyep/admin_room_fix 
Fixes blast door buttons, refactors buttons to remove range var
 2019-01-31 11:04:45 +08:00
variableundefined
21cc9d882f Merge pull request #10680 from Aurorablade/EXTERMINATUSPARTONE 
I JUST CONFLICTED EVERYTHING
 2019-01-31 11:03:33 +08:00
Alffd
110d3b17b4 Revert "Discord Bot Functionality" 2019-01-30 21:19:33 -05:00
Aurorablade
afc6ad524f DMI File Casing Rename 2019-01-30 20:09:39 -05:00
Kyep
a23c55a541 Eliminates 'range' var from door_controls, uses tags/zlevel instead 2019-01-29 18:13:23 -08:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
AffectedArc07
e7405fcd3f Merge branch 'master' into darkmode-sql 2019-01-29 16:31:57 +00:00
variableundefined
9f34d70034 Merge pull request #10772 from Kyep/hellhound_fix 
Hellhound AOE fix, hound description update
 2019-01-29 16:35:37 +08:00
variableundefined
8f61180541 Merge pull request #10767 from farie82/virology-hotfix 
Fixes the virus referencing bug
 2019-01-29 16:32:24 +08:00
Kyep
94b76aead9 AOE fix, desc update 2019-01-28 22:51:51 -08:00
variableundefined
5f7eacf4ad Merge pull request #10756 from datlo/abductorbrain 
Changes abductor brains to use the alien brain sprite
 2019-01-29 11:09:33 +08:00
variableundefined
e13a536ddc Merge pull request #10585 from v0idp/discord_bot 
Discord Bot Functionality
 2019-01-29 10:43:51 +08:00
lass9030
e4eedaf975 correct meat type for cake cat 2019-01-29 00:45:01 +01:00
joep van der velden
53396bea95 Fixes the virology problem 2019-01-28 18:02:20 +01:00
variableundefined
1a0737bf59 Merge pull request #10751 from Diegoflores31/patch-2 
Update Crossbow.Dm
 2019-01-28 17:13:25 +08:00
variableundefined
c0f640f3e5 Merge pull request #10763 from Ionward/ionwardfluff 
Ionward Fluff Labcoat
 2019-01-28 13:06:54 +08:00
Ionward
14d23a7eb2 ionward_fluff_labcoat 2019-01-27 19:09:04 -08:00
variableundefined
70ddb65f29 Merge pull request #9287 from Citinited/funny-chemicals 
Adds a new clown chemical 🤡
 2019-01-28 06:11:38 +08:00
AffectedArc07
b078d356c4 oops forgot that 2019-01-27 16:07:28 +00:00
AffectedArc07
edf7667869 WORKING TOGGLEABLE DARKMODE (With <3 to Teri) 2019-01-27 16:02:17 +00:00
datlo
f6728186c1 Abductors now use the alien (grey) brain sprite 2019-01-27 13:55:43 +00:00
Diegoflores31
ec630e9fee Update Crossbow.Dm 
A little bit more damage to the makeshift bolt than before 

Before 8 ==> now 10 (like floor tile)
 2019-01-27 01:35:26 -05:00
variableundefined
8ed01b6440 Merge pull request #10726 from TDSSS/syndie-med-borg-tweak 
Gives syndie medical borgs hydrocodone instead of ether
 2019-01-27 12:53:33 +08:00
variableundefined
0f9ae9c3dc Merge pull request #10747 from Kyep/updates_jmp_links 
Fixes admin co-ord jump
 2019-01-27 11:38:39 +08:00
Kyep
69b902503e Fixes admin co-ord jump 2019-01-26 18:40:53 -08:00
variableundefined
920395cc7e Merge pull request #10395 from granodd/GunsAndGunAccessories 
New Gun Sounds
 2019-01-27 10:37:03 +08:00
variableundefined
dca84ba581 Merge pull request #10741 from Kyep/hear_say_annoyance 
Fixes hear_say.dm runtime: list index out of bounds
 2019-01-27 10:04:28 +08:00
Kyep
43e2f13226 revert change causing new handling for single-word messages 2019-01-26 17:45:36 -08:00
Kyep
c20919d201 Fixes whispers not being logged properly 2019-01-26 16:44:07 -08:00
Kyep
0872474e34 fixes hear_sleep call too 2019-01-26 15:55:51 -08:00
Kyep
03f4fea43c fixes hear_say.dm,162: list index out of bounds error 2019-01-26 15:41:46 -08:00
variableundefined
4d30623a0d Merge pull request #10727 from datlo/idedplsremovebatswarm 
Remove bat swarm from gold slime spawn pool
 2019-01-27 06:34:20 +08:00
variableundefined
1669fd51e8 Merge pull request #10734 from datlo/syndimedbody 
Adds the cyborg body analyzer to syndi medborgs
 2019-01-27 06:24:49 +08:00
Citinited
e542258e64 slight jestosterone description tweak 2019-01-26 13:21:03 +00:00
Citinited
eebd8d782f Uses squeak component to do this, fixes broken stuff & Travis 2019-01-26 13:21:03 +00:00
Citinited
27b7c87585 whoopsie 2019-01-26 13:21:02 +00:00
Citinited
4913f343ed Adds jestosterone component 2019-01-26 13:21:02 +00:00
Citinited
e71dfaf730 Moves stuff round slightly 2019-01-26 13:21:02 +00:00
Citinited
c1e9137fa3 Jestosterone plays a honk when mixed; better way of handling job check 2019-01-26 13:21:02 +00:00
Citinited
d45e33efb5 Removes jestosterone triggering upon alien attack, uses space drugs instead of mercury in its creation 2019-01-26 13:21:02 +00:00
Citinited
3f57d62efb Adds jestosterone 2019-01-26 13:21:02 +00:00
variableundefined
7bab369b49 Merge pull request #10700 from datlo/bookforce 
Add force to books, extra to space law
 2019-01-26 19:45:34 +08:00
Granodd
6c53564df2 Merge branch 'master' into GunsAndGunAccessories 
# Conflicts:
#	code/modules/projectiles/guns/projectile/automatic.dm
 2019-01-26 02:17:22 -05:00
datlo
e7eef0bf42 Fix bluespace bunny ears fluff desc 2019-01-26 00:53:02 +00:00
variableundefined
05c6ee0107 Merge pull request #10718 from Jazz23/Surgical-Arm-implant-quickie 
Small Surgical Arm Menu Change
 2019-01-26 07:00:10 +08:00
Gwydion Brain
cc05eda75e Merge branch 'master' into CheekyCrenando_Fluff_coat 2019-01-25 13:13:20 -08:00
datlo
613999bfc6 Syndicate medborgs now get body analyzer 2019-01-25 20:51:45 +00:00
datlo
20e9968528 Remove batswarm from xenobio spawn pool 2019-01-25 14:17:26 +00:00
TDSSS
2bbff57c7c Gave syndie medical borgs hydrocodone 2019-01-25 14:33:02 +01:00
variableundefined
703482736e Merge pull request #10711 from Aurorablade/PSFluffBunny 
Pineapple Salad Fluff Item:Bluespace bunny ears
 2019-01-25 09:14:49 +08:00