cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 19:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,749 Commits 26 Branches 2 Tags
61d5eff00aae3644ffe4faec2cac1eade0d64df3
Commit Graph

203 Commits

Author SHA1 Message Date
Ren Erthilo
d14a05f7b0 Hotfix for virology. 2012-04-08 09:23:49 +01:00
Ren Erthilo
61cc933a38 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-04-08 08:06:03 +01:00
cib
007b4849de Bugfix: No, new/list is not a way to create lists! (Probably fixes virology) 2012-04-07 20:28:43 -07:00
Ren Erthilo
d52701ee84 Adds objects: office chairs, feathery pen, glass and normal research airlocks, showers, styrofoam cups. Adds clothes: Fez, cheerleader outfits, captain mal uniform, hazmat suits, wedding dress, AI bliss icon. New icons for captain, head of security, security, and warden's lockers. 2012-04-07 09:58:54 +01:00
Ren Erthilo
ebebfaabb3 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates 
Conflicts:
	code/modules/mob/mob_defines.dm
 2012-04-04 20:19:23 +01:00
SkyMarshal
5b20f6a2fd Adds dismemberment to Tajarans and Monkeys. Added some sanity checks to prevent you from punching you when they are missing hands. Fixed more wound stuff. Some examine fixes. Adds a hasorgans proc which checks if the given argument is a mob with organs. Fixed pathing for guncode. 2012-04-02 19:44:43 -07:00
Ren Erthilo
af9a80cce4 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates 
Conflicts:
	code/modules/mob/mob_defines.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/storage.dmi
	maps/tgstation.2.0.8.dmm
 2012-04-02 00:37:54 +01:00
SkyMarshal
cd4a82a90b Fixes for the fingerprint runtimes, other runtimes, the new damage system, and the new objective system, to reduce the super hard objectives. 2012-03-31 22:01:21 -07:00
SkyMarshal
a90173c628 Part one of bugfixes for the new damage system. 2012-03-31 22:01:21 -07:00
Ren Erthilo
a1b235cf36 Fixed syringes not updating. Added missing vomit sprites. Added missing syringe sprites. 2012-03-31 01:05:24 +01:00
Ren Erthilo
4c8d454a45 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-03-30 23:58:50 +01:00
Ren Erthilo
ae57f8db64 Merging SkyMarshal's stuff. 2012-03-30 16:26:04 +01:00
Ren Erthilo
7cf7c7775a Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates 2012-03-30 06:18:37 +01:00
Ren Erthilo
abeea22566 Rebalanced beer and made ethanol the base alcohol. Slightly tweaked alcohol effect rates. 2012-03-30 05:52:18 +01:00
SkyMarshal
08a060501b Merged in Erthilo's stuff. 2012-03-29 21:11:17 -07:00
SkyMarshal
61820bc5ec Final commit of the examine/damage overhaul. 2012-03-29 20:44:10 -07:00
SkyMarshal
01d2d5f339 WIP bloodloss and scaring system. 2012-03-29 20:42:08 -07:00
Ren Erthilo
6952bef874 Reverting disabilities, headsets, murder sydie pack, photo removal, isbreathing and internals. 2012-03-30 04:19:22 +01:00
Ren Erthilo
78b9e9928a Reverts descriptions/names and old syndicate uplink. Adds sprites for advanced medical items. 2012-03-28 22:52:00 +01:00
Ren Erthilo
e6b85575f6 TG: brainloss is now only referenced via procs. r2874 2012-03-26 23:20:45 +01:00
Ren Erthilo
add06af9fd TG: cloneloss is now only referenced via procs. r2871 2012-03-26 23:11:56 +01:00
Ren Erthilo
b6b54cc8ec TG: Removing some references and replacing with the god procs. oxyloss mostly this 
time.
 2012-03-26 18:10:28 +01:00
Ren Erthilo
470d767369 Reverting registered_name change. Reverting area name changes. Reverts Plasma Steel and object changes. 2012-03-26 15:47:39 +01:00
Ren Erthilo
089e844be9 A large amount of groundwork for /tg/ code. Comes with some gameplay changes. 
* + You now take severe brute damage in environments over 750kPA. A new HUD icon warns you when it's above 500kPA. Space suits block this.
* > Welding fuel tanks explode when shot.
* > Riot shields prevent you from being pushed.
* > People cannot be shoved when being pulled and handcuffed.
* > The internals button on the hud now works for tanks in almost any area, such as your pocket.
* > No more popups when you insert your ID into your PDA. There's a link in the PDA menu to update info.
* - Removed photo system from ID's as it doesn't work.
 2012-03-26 03:16:01 +01:00
Ren Erthilo
cbe1b079c7 Added hint about sleep toxins for sleepers. Tea now uses tea sprites. 2012-03-25 08:17:30 +01:00
Ren Erthilo
7eae871ece Added colour hints to the sleepers about overdoses. Removed absorption overdose in favour of amount overdose. 2012-03-24 04:36:25 +00:00
cib
42e21b3447 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-03-21 20:10:26 -08:00
cib
a756768dce Alcohol fixes. 
- Alcohol is now used up faster
- Drinking different types of alcohol now makes you slurr as fast as drinking the same type.
- Cocktails are now subtypes of alcohol, making the code more consistent.
 2012-03-21 17:33:54 -08:00
CIB
1dd17e60a3 Merge pull request #727 from SkyMarshal/Airlocks 
Made appendicitis only happen once, jump to explosion link should work, hallucination improvement/sanchecking, increased the damage of things to pre-nerf levels.
 2012-03-21 10:02:27 -07:00
SkyMarshal
b86cd6bda4 MAde appendicitis only happen once, jump to explosion link should work, hallucination improvement/sanchecking, increased the damage of things to pre-nerf levels. 2012-03-21 09:46:42 -07:00
Ren Erthilo
c36192773f Reduce pill amounts due to chemical rebalance and overdose. 2012-03-20 19:40:05 +00:00
Ren Erthilo
192fb1fef8 Alcohol port, now makes your vision blurry and also makes you pass out. 2012-03-19 03:56:32 +00:00
Miniature
f44a005b49 Nerfed unstable mutagen back to what it was before metabolism change 2012-03-18 00:58:27 +10:30
Albert Iordache
593c1dc505 Merge pull request #697 from comma/master 
Made alcohol reagents code pretty
 2012-03-17 04:27:09 -07:00
comma
4b271bcac0 Cleaned up alcohol code 
Removed a lot of duplicate code by making a base 'alcohol' class.
 2012-03-17 12:58:51 +02:00
misterfox
64f50d0d04 Tajara stuff 2012-03-16 12:20:42 -04:00
Miniature
9c270c2571 Fixed removing the first beaker from chem grenades, fixed premade grenades not working 2012-03-16 16:42:27 +10:30
cib
8bd6731aaa Fixed the rate of a few chemicals, including coffee. 2012-03-15 05:09:16 -08:00
Tastyfish
f7e857d45c Merge remote-tracking branch 'upstream/master' 2012-03-08 00:47:27 -05:00
Tastyfish
6874cc03d1 cleaned up the paths of a few ported things 2012-03-08 00:46:24 -05:00
Miniature
cf53a0cc7a Attack logging (finally) 
there might be some things I missed, and feel free to change the messages if you want
 2012-03-08 15:16:54 +10:30
SkyMarshal
7456fb7eae Merge pull request #623 from CIB/master 
Look, there's a lot of stuff in here now, just read the commits
 2012-03-07 13:26:37 -08:00
SkyMarshal
c522b5db7b Holy shit did that speed things up. 2012-03-06 21:09:56 -07:00
cib
93c91b6018 You can no longer extract chemicals directly from blood. 
Derp me, I didn't know extracted blood had a trace chemicals variable.
 2012-03-05 10:45:26 -08:00
cib
4c93cda368 Slowed down the rate at which most chemicals are absorbed. This may still need balancing in some areas. 2012-03-04 17:15:43 -08:00
cib
88c8893cdb Fuel tanks can now be ignited by fire. 2012-03-04 16:28:41 -08:00
Ren Erthilo
ba38c4b11f Tweaked overdose values so sleepers don't leave any toxin damage. 2012-03-04 16:05:00 +00:00
SkyMarshal
6ab370768b Nerfed overdose damages. 2012-03-03 21:20:42 -07:00
cib
e0a919be43 Monkeys now react to being attacked by doing emotes and trying to run away. 2012-03-01 16:03:55 -08:00
SkyMarshal
67502c5d2e Bugfixes for Hallucinations, borgs'n'doors, and airlocks autorefreshing. 2012-02-29 22:21:01 -07:00