cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-11 10:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,949 Commits 26 Branches 2 Tags
d02165e0f94de2c4a9399a8699cc355da4f8a329
Commit Graph

710 Commits

Author SHA1 Message Date
Mark van Alphen
ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02:00
Mark van Alphen
6aba8f9e52 Address comments 2019-06-03 02:40:30 +02:00
Mark van Alphen
0971a45fbd Fix capitalization 2019-06-03 01:53:39 +02:00
Mark van Alphen
697bb8eee5 More Lavaland fixes: 
- Air alarm computers will no longer display alarms that can't be remote controlled
- Survival capsules now have a NanoMed
- Fixed the disk compartmentalizer not having a sprite when something is put in
- Fixed the drying rack not having a sprite when something is put in
- Turned water bottles into glass containers so they have more functionality
- Hairless hide can now be made wet using water
- Reagents in glass containers can now be fed to others
 2019-06-02 23:29:50 +02:00
Mark van Alphen
4423962a2a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/controllers/subsystem/mapping.dm
#	paradise.dme
 2019-04-26 23:07:57 +02:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen
a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2019-04-04 22:04:55 +02:00
Mark van Alphen
19b923c999 Ash Walker/Gutlunch fixes. Glass containers now do not splash on help intent, for milking. 2019-04-03 17:24:55 +02:00
Mark van Alphen
f75de97c6e Port over Corn and affected's work on Lavaland 
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com>
Co-authored-by: CornMyCob <xxxxbarryscottxxxx@gmail.com>
 2019-04-01 23:41:32 +02:00
Fox McCloud
6fadf083d7 OHHHH SHITTTT ANTTTSSS 2019-04-01 01:27:49 -04:00
Mark van Alphen
1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02:00
Mark van Alphen
ceceb9f3b3 Largely finish up beach ruin 2019-03-31 00:20:27 +01:00
Fox McCloud
d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
variableundefined
85ab7a8b06 Merge pull request #11065 from Fox-McCloud/pill-bottles-and-patch-packs 
[Goonchem] Pills, Bottles, Patches, and Pillbottles
 2019-03-24 17:51:00 +08:00
variableundefined
4ca33bb19d Merge pull request #11078 from Fox-McCloud/goonchem-reagent-temperature 
[Goonchem] Reagent Temperature and Pyrotechnics
 2019-03-24 17:50:07 +08:00
Fox McCloud
277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
joep van der velden
e83a7131cc Refactored pickup code and fixed the bug 2019-03-18 16:42:44 +01:00
Fox McCloud
d61bbe807d [Goonchem] Pills, Bottles, Patches, and Pillbottles 2019-03-17 21:30:10 -04:00
Dave
c50ffff232 How the heck did this pass travis 
Removes an extraneous call to super while defining the data members of the salglu bag. Whoops.
 2019-02-25 21:56:00 -05:00
Dave
e5d01311d6 Review Concerns 2019-02-23 23:00:53 -05:00
Dave
5664206697 review changes 2019-02-17 14:44:49 -05:00
Dave
c16702e235 Slight tweaks 2019-02-15 17:31:56 -05:00
Dave
7302fe038f IV bag transfer rate tweak 2019-02-15 10:45:49 -05:00
Unknown
5ab0af3b25 Medical QoL PR 2019-02-15 00:10:08 -05:00
variableundefined
70ddb65f29 Merge pull request #9287 from Citinited/funny-chemicals 
Adds a new clown chemical 🤡
 2019-01-28 06:11:38 +08: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
Citinited
4913f343ed Adds jestosterone component 2019-01-26 13:21:02 +00:00
TDSSS
2bbff57c7c Gave syndie medical borgs hydrocodone 2019-01-25 14:33:02 +01:00
variableundefined
3445d46b20 Merge pull request #10689 from AzuleUtama/dampRagLidFix 
Stops damp rag having a lid, refactors glass containers to let objects state if they lack a lid
 2019-01-24 18:13:22 +08:00
AzuleUtama
898725ee60 Formatting, description and spelling changes 2019-01-22 16:45:13 +00:00
AzuleUtama
0293d2674c the rerefactor 2019-01-22 10:32:44 +00:00
AzuleUtama
feaa20352b fixes damp rag having a lid 2019-01-20 18:28:07 +00:00
Kyep
bf9d0b088f merge conflict fix, reset map 2019-01-07 16:37:07 -08:00
variableundefined
6785ba9b06 Merge pull request #10602 from Fox-McCloud/auto-injector-fix 
Fixes Auto Injectors
 2019-01-06 18:21:47 +08:00
Fox McCloud
f6029631b1 Fixes Auto Injectors 2019-01-06 04:36:16 -05:00
Kyep
0567eab562 Merge branch 'sol_trader_update' of https://github.com/Kyep/Paradise into sol_trader_update 2019-01-03 14:40:07 -08:00
Kyep
d488195799 fix merge conflict, wipe map changes 2019-01-03 14:39:41 -08:00
datlo
244fcfc739 capu/capu+ fake death for realsies, add fake death pills to syndis/maint 2019-01-02 09:46:03 +00:00
Kyep
46acb9338b sunglasses, seeds, KA, IMS, fleshy 2018-12-22 14:16:25 +00:00
Kyep
702f4db165 outfit, vehicles, paperfix, viruses 2018-12-12 00:31:56 -08:00
variableundefined
9e59827416 Merge pull request #10351 from Citinited/duct-tape-stick-tweak 
You can stick duct tape to more than just paper now
 2018-12-11 20:18:05 +08:00
Kyep
7c1f40ea14 WIP omnizine/SR/virus bottles, minerals 2018-12-08 19:33:21 -08:00
Citinited
6354631937 Fixes lots of items not being taped by duct tape; tape won't be applied to bags if it can be inserted 2018-12-01 00:13:21 +00:00
tigercat2000
e56750481c Multilingualism 
This commit adjusts the speech parsing system to allow for an infinite
number of languages to be present in the same message. You can
transition freely between any language you are able to speak simply by
putting it's language key in the middle of the sentence.

Honestly, this was a massive pain in the ass, and there's probably still
broken stuff, even though I've spent around 8 hours testing and refining
this.
 2018-11-24 00:22:05 -08:00
variableundefined
7905b64076 Port over fermentation barrel, minor refactor of reagent container, add in wine power etc. 2018-11-01 11:01:45 +08:00
variableundefined
aa9b6c64d2 Merge pull request #9887 from farie82/Viral-injector 
Adds the viral injector as a job specific item for the virologist
 2018-10-21 18:31:49 +08:00
variableundefined
600de8ba24 Deconflict 1 2018-10-21 07:56:55 +08:00
Crazy Lemon
d843796448 Merge pull request #9839 from variableundefined/ReverseMedicalCyborg 
Fixes reversed medical cyborg hypospray log message
 2018-10-20 16:33:08 -07:00
Desolate
91ae4713b8 removes mushroom changes 2018-10-20 16:34:24 -05:00
joep van der velden
bbff7546d0 Fixed the weirdness 2018-10-20 18:58:42 +02:00