cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-23 16:51:53 +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
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
1b833e1af9 Adds an alert for Drask breath regen 2016-04-28 16:36:25 -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
Aurorablade
68a4a0a417 Stealth canes 2016-04-27 19:33:10 -04:00
IK3I
ad5c5dca39 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2016-04-27 18:20:50 -05:00
Aurorablade
7a99d8fe74 Crazy Fethas Traitor Emporium of Horrors 2016-04-27 19:09:21 -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
IK3I
dfc83af228 Switch from random IDs to static assignment 2016-04-27 10:11:21 -05: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
IK3I
7ea9dd2a36 Adds Pod Locks 
Adds key and tumbler based pod locks
Adds lock pod system
Adds pod lock to sec pod
Adds keys to sec pod in HoS and Pilot Offices
 2016-04-27 04:18:11 -05: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
3825cd51de Merge pull request #4291 from Fox-McCloud/camera-alt-fix 
Abductor Camera Alt Fix
 2016-04-26 19:33:32 -04:00
TheDZD
c0ccc56969 Merge pull request #4288 from Fox-McCloud/door-wands 
Ports Door Wands
 2016-04-26 19:31:41 -04:00
Fox-McCloud
a275496723 my code immersions 2016-04-26 19:25:40 -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
Fox McCloud
283acc01d3 Merge pull request #4258 from pinatacolada/fridges 
Makes fridge boards be selectable
 2016-04-26 18:54:17 -04: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
b4469854bf re-add circuit imprinter efficiency 2016-04-26 03:16:00 -04:00
Fox-McCloud
371a122430 Hair Request 2016-04-26 01:26:24 -04:00
Fox-McCloud
d03a7ba7b5 fixes and defines 2016-04-26 00:51:24 -04:00
Fox-McCloud
a4dce5dd5f Nutrition Fix 2016-04-25 23:30:55 -04:00
Fox-McCloud
52b810a8ba Abductor Camera Alt Fix 2016-04-25 22:35:51 -04:00
Fox-McCloud
ddff923cd1 increase materials amount 2016-04-25 20:23:00 -04:00