cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 11:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,665 Commits 26 Branches 2 Tags
f8ce4e5fb24cc0bb6946e73cfbb35cb2716d3757
Commit Graph

13070 Commits

Author SHA1 Message Date
Tastyfish
3b59d2cd15 Defers pipenet and powernet rebuilds upon destruction of pipes and cables so explosions are faster 2016-04-29 23:42:47 -04:00
Fox-McCloud
f1acc84b8c Merge remote-tracking branch 'upstream/master' into hair 2016-04-29 19:48:49 -04:00
TheDZD
411dbdcf40 Merge pull request #4246 from FlattestGuitar/lightbulbs 
Lightbulbs no longer burn you, lighters do a bit less.
 2016-04-29 19:44:01 -04:00
Fox McCloud
e34fa95fae Merge pull request #4187 from QuinnAggeler/Paradise-drask 
New race, the Drask
 2016-04-29 19:40:45 -04:00
HugoLuman
c7d2359a1f Moves Drask to the end of the species list 
Puts them in proper numerical order in client procs.dm
 2016-04-29 14:08:11 -07:00
Fox McCloud
7adaa11a46 Merge pull request #4317 from Tastyfish/check-antags 
Fixes Check Antagonists Panel
 2016-04-28 22:34:55 -04:00
Tastyfish
5268804db0 Fixes Check Antagonists Panel 2016-04-28 22:23:42 -04:00
HugoLuman
5dfb7b9851 Fixes the karma buy order in karma.dm 
Hopefully this won't mess up what species people have unlocked now
 2016-04-28 19:00:43 -07:00
HugoLuman
6285d42236 Fixes the karma buy order in client procs.dm 
Hopefully this won't rearrange what species people have unlocked now
 2016-04-28 18:59:53 -07:00
HugoLuman
4b52de7791 Sets the right alarm levels, removes ptless else 2016-04-28 18:45:21 -07:00
Fox McCloud
a883a7a6f6 Merge pull request #4305 from LittleBigKid2000/whydoesitneedtobecanned 
Booze dispensers can now dispense synthanol
 2016-04-28 20:23:56 -04:00
Fox McCloud
ad16e065af Merge pull request #4314 from Crazylemon64/autosay_fix 
Fixes autosay to no longer create AIs for their messages
 2016-04-28 20:23:37 -04:00
Fox McCloud
b743ae0ac2 Merge pull request #4315 from IK3I/No-Drop-Holster-Fix 
Prevents Holstering of No-Drop items
 2016-04-28 20:23:24 -04:00
HugoLuman
e255434a8f Adds the new alerts to Drask breath code 2016-04-28 16:36:44 -07:00
HugoLuman
97e07ba05f Fixes copy error, outdated alert code 
Removes outdated alert code for breath temperatures, fixes copy error in regen tier 1
 2016-04-28 16:15:39 -07:00
IK3I
ec4ba9f5f6 Prevents Holstering of No-Drop items 2016-04-28 18:00:44 -05:00
Fox McCloud
8892def83c Merge pull request #4289 from pinatacolada/pman 
Plasma security now spawn with their gun in the bag
 2016-04-28 18:39:41 -04:00
Fox-McCloud
d29ceda262 Merge remote-tracking branch 'upstream/master' into hair 2016-04-28 18:37:56 -04:00
Crazylemon64
501fa17958 Fixes autosay to no longer create AIs for their messages 2016-04-28 14:53:52 -07:00
Isaac Erwin
42c48eec77 Fixes the spacing on the dispensable reagents for the chem, booze, and soda dispensers 
Now's a better time than ever
 2016-04-28 09:08:02 -04:00
Isaac Erwin
013d334de0 Booze dispensers can now dispense synthanol 2016-04-27 19:40:53 -04:00
TheDZD
a820ef101f Merge pull request #4296 from CrAzYPiLoT-SS13/chess_print 
Makes gameboard circuits printable
 2016-04-27 18:50:34 -04:00
Fox McCloud
110958860b Merge pull request #4270 from FlattestGuitar/foamforce 
Ports /tg/ FOAM FORCE
 2016-04-27 11:43:55 -04:00
Mieszko Jędrzejczak
ef13110610 Permanently dooms everyone and basically kills the universe. 2016-04-27 15:07:30 +02:00
Mieszko Jędrzejczak
6c21db1433 Adds different interactions on different intents 2016-04-27 12:10:48 +02:00
Mieszko Jędrzejczak
9f8a8cef9b Grammar and that weird proc. 2016-04-27 10:56:04 +02:00
Tastyfish
f8ebf7d672 Fixes reviving while restrained 2016-04-27 04:22:47 -04:00
pinatacolada
e961d51472 removes judge dred 2016-04-27 01:39:29 +01:00
HugoLuman
5915619c4d Merge branch 'master' of https://github.com/QuinnAggeler/Paradise into Paradise-drask 
# Conflicts:
#	icons/mob/human_face.dmi
 2016-04-26 17:32:04 -07:00
TheDZD
ddc459d92a Merge pull request #4189 from Fox-McCloud/xenobio-additions 
Xenobio Addition
 2016-04-26 20:23:49 -04:00
Fox-McCloud
d5fb23d4d7 no fun crew has arrived 2016-04-26 20:12:31 -04:00
Fox McCloud
c07b0130f1 Merge pull request #4297 from FlattestGuitar/examine 
Fixes Unathi examine message.
 2016-04-26 19:34:52 -04:00
TheDZD
8488c976e8 Merge pull request #4262 from KasparoVy/IPC-EXTRA-STUFF-REFACTOR 
Refactor FBP Parts & Adds Prosthetic Brand Models & More Antennae & Continued....
 2016-04-26 19:15:19 -04:00
TheDZD
ebb124dfc9 Merge pull request #4282 from QuinnAggeler/IPCfix 
Fixes braindead IPC death message spam
 2016-04-26 19:14:10 -04:00
TheDZD
23174def7a Merge pull request #4283 from Tastyfish/checkout-my-moves 
Makes admin jump commands use forceMove(), improves forceMove
 2016-04-26 19:13:09 -04:00
HugoLuman
09faec8ffa Removes tier 4 regen 
Max regen now 3 brute/burn every 4 ticks (~8 seconds)

Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-26 16:12:53 -07:00
Tastyfish
a9582d9247 Improves admin jump commands, forceMove 2016-04-26 18:53:17 -04:00
Mieszko Jędrzejczak
73affd479e GODDAMN LIGGERS 2016-04-26 21:55:14 +02:00
Matt
f6808794aa Makes gameboard circuits printable 
Whoops!
 2016-04-26 16:19:30 +02:00
Mieszko Jędrzejczak
d35248366a Thingies don't embed, icons work. 2016-04-26 11:30:52 +02:00
Fox-McCloud
371a122430 Hair Request 2016-04-26 01:26:24 -04:00
Fox-McCloud
a4dce5dd5f Nutrition Fix 2016-04-25 23:30:55 -04:00
TheDZD
18a63c788d Merge pull request #4267 from tigercat2000/CRAZY_HUDS_AMIRITE 
-tg- HUD styles
 2016-04-25 19:57:59 -04:00
TheDZD
98a94a37d5 Merge pull request #4273 from FlattestGuitar/examine 
Makes a human's species visible on examine.
 2016-04-25 18:37:17 -04:00
TheDZD
f65910c3d9 Merge pull request #4274 from tigercat2000/attackpref 
#4243 preference option
 2016-04-25 18:34:48 -04:00
TheDZD
cdc20258a1 Merge pull request #4212 from Tastyfish/bans 
Cleans up special role jobbans
 2016-04-25 18:34:37 -04:00
TheDZD
6e71809d5e Merge pull request #4272 from Fox-McCloud/injections 
Fixes Several Injections
 2016-04-25 17:17:58 -04:00
pinatacolada
ee40390ffe Plasma security now spawn with their gun in the bag 
Fixes #4071

Warden, officers, and pod pilot spawn with the taser in their bag.
Head of Security spawns with egun in the bag.
Brig physician spawns with pen light in their bag.
Also made other species pod pilots spawn with the taser in their bomber
jacket, since it now can hold it, and is more consistent with the rest
of the officers

🆑 pinatacolada
fix: Plasmamen security now spawn with their suit slot items in their
bags
tweak: Pod pilots spawn with taser in the suit slot
/🆑
 2016-04-25 17:47:46 +01:00
Mieszko Jędrzejczak
399fe7cdc2 slime people whoopsie 2016-04-25 12:50:45 +02:00
Mieszko Jędrzejczak
0f7be5576f Gunshot sounds, uplink references, less spammy tommygun, fixes 2016-04-25 11:32:48 +02:00