cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 15:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,660 Commits 26 Branches 2 Tags
d4fe9b0f0fe8d030ae9fe472fc209c3ea2e2c2df
Commit Graph

2408 Commits

Author SHA1 Message Date
Sirryan2002
a3e7a0a700 Fixes Jestosteron and Clipboard runtime (#17509) 
* clipboard fix

* jestosterone runtime fix
 2022-03-27 11:33:03 +01:00
warriorstar-orion
49953f386a Display container transfer amounts on examine. (#17416) 2022-03-04 10:21:11 +01:00
Kevin Fries
615c9a2dbd Repair description of irish_cream and beepsky_smash (#17443) 2022-02-24 15:18:56 +01:00
SteelSlayer
7131a3f2e2 Fixes Dreamchecker warnings in the codebase (#17422) 2022-02-23 08:36:02 +01:00
Qwertytoforty
c8cdb70fd7 Fixes spelling of three mile island iced tea (#17362) 2022-01-22 19:06:41 +01:00
Charlie
a0e5d6df44 Datumized vampires (#17166) 
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
 2022-01-18 21:16:09 +01:00
Sirryan2002
1da61d4d27 Adds a cap to Xenobiology Mobs and Allows Sentient Giant Spider prompts to be disabled (#17316) 
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
 2022-01-16 18:54:10 +01:00
Tomás Alves
cfa4d63233 Fix Typo cluches -> clutches (#17289) 
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2021-12-31 19:10:35 +01:00
ike709
d81602416e Fixes bad taste description logic for fruit wine (#17230) 2021-12-17 10:32:16 +01:00
AffectedArc07
2d5736a61c Removes brig phys, adds another officer slot to compensate (#17180) 2021-12-06 15:00:43 +01:00
Charlie
31b336da64 minor external organ refactor (#16183) 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
 2021-12-01 22:17:44 +01:00
Charlie
634f9c72f1 Vampire Rework. (#16476) 
* vampire rework

* fixes and tweaks

* cleanup + tweaks

* grug stomp

* TGUI

* TGUI rebuild

* UID fix

* debugging cooldown fix

* first review changes

* subclass refactor

* tweaks + some sprites

* blackbox logging

* tweaks + grammar

* minor UI tweaks

* ability icon sprites.

* placeholder sprite warning fix

* melee mod code comment warning

* nullification rework

* final sprites!

* fixes

* sabre review pt 1

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* sabre review pt2

* sprites readd

* tgui rebuild

* removes traitor vampires

* fixes

* readds sprites

* runtime fixes

* hotfix

* more runtime fixes

* glare tweak. less confusing when the vampire is stunned.

* gargantua nerf

* minor tweaks.

* hemomancer nerfs

* bugfixes and cleanup

* I did a dumb

* couple of fixes

* confusion and shadow snare fixes

* hemomancer nerfs part 2 electric boogaloo

* TGUI rebuild

* fixes and easier events

* Umbrae tweaks

* gargantua tweak

* umbrae nerf 2 electric boogaloo. also var edit suggestion

* runtime fix

* buffs blood nutrition to be in line with its metabolic rate

* Henk stuff

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* more review changes

* final tweak

* affected request + runtime fix

* FUCK

* fat fucks

* darkness tweaks

* UMBRAE AAAAAAAAAAAAAHH

* force doors bugfix

* either git or I am drunk

* admin rejuv fix

* I CANNOT SPELL

* shitnt code

* steel review

* tgui rebuild

* mochi review

* vampire ability usage logging

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-11-14 15:34:56 +01:00
joep van der velden
39a280effd Shooting fuel tanks now is logged properly 
objects that get qdeleted are only hit once by bullets
 2021-11-10 10:23:47 +01:00
AffectedArc07
129318891d Nukes spacepods and associated jobs 2021-10-02 13:16:24 +01:00
variableundefined
7c996437ed Merge pull request #16766 from S34NW/spin_the_drinks 
Allows rotating booze and soda dispensers with alt click
 2021-09-25 16:04:29 -05:00
S34N
c0d9b0348b Update code/modules/reagents/chemistry/machinery/chem_dispenser.dm 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-09-25 21:24:38 +01:00
variableundefined
933f47a15e Merge pull request #16673 from botka4aet/grinder 
Grinder - Use items for full container, not all
 2021-09-23 18:58:54 -05:00
botka4aet
66595eab79 Update reagentgrinder.dm 
For some reasons this check at start cicle is bad. Don't think about it before.
 2021-09-23 18:23:06 +03:00
botka4aet
2c4cf6db3d Syntax fix 2021-09-23 18:12:13 +03:00
SabreML
d4f8a08531 parallel = FALSE 2021-09-22 19:20:39 +01:00
S34NW
9ce920bbbf spinny drink dispensers 2021-09-22 11:56:20 +01:00
SabreML
a0fef16d3e Reagent name capitalisation 2021-09-18 18:11:44 +01:00
variableundefined
fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines 
Adds defines for damage flags
 2021-09-17 22:10:20 -05:00
Fox McCloud
3e9001f7ee Nerfs Earthsblood 2021-09-15 14:32:10 -04:00
Vi3trice
6657630a95 Update code/modules/reagents/chemistry/reagents/misc.dm 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-09-12 16:17:08 -04:00
Vi3trice
647f8e41e5 Spraytan gradually makes you darker 2021-09-12 14:22:00 -04:00
botka4aet
d84290b28c All_In_One Grinder 
Now can grind rods
Don't use all grinding stack items
 2021-09-10 17:43:14 +03:00
Sirryan2002
2d3f02e795 Changes Gimlet Recipe + Result Amount 2021-09-04 16:06:34 -04:00
variableundefined
50ec519bcd Merge pull request #16320 from thatdanguy23/newdrinks 
six new drinks
 2021-09-01 19:49:20 -05:00
S34NW
27b88d027b sabre fixes 2021-08-22 20:35:46 +01:00
S34NW
1d702d6250 "in use" drink dispenser sprite 2021-08-22 16:57:39 +01:00
Mieszko Jedrzejczak
559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
S34NW
85c53544dd bodybags, new cutlery, proper booze+beer dispenser, big heater beaker 2021-08-20 12:32:23 +01:00
S34NW
fd5dad6654 old bottles now use the right lids 2021-08-20 12:17:18 +01:00
S34NW
e2227c7833 more chem stuff 2021-08-20 11:44:52 +01:00
S34NW
e390fd9a8b reworked so its just part 1 2021-08-19 22:03:37 +01:00
joep van der velden
7ed779b2e4 Merge remote-tracking branch 'upstream/master' into fireflash-fixes 2021-08-15 10:14:43 +02:00
variableundefined
aa820ab123 Merge pull request #16291 from SabreML/brass 
Craftable brass sheets
 2021-08-13 23:40:03 -04:00
variableundefined
d2d2af6a14 Merge pull request #15952 from farie82/runtime-fixes-6 
Fixes 4 runtimes. Linked forum account message is now shown properly
 2021-08-11 16:06:57 -04:00
SabreML
bb82a58c8f Merge remote-tracking branch 'upstream/master' into brass 2021-08-04 19:32:12 +01:00
danni boi
c8fdbc32ff Update code/modules/reagents/chemistry/reagents/drink_cold.dm 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-28 15:43:34 +01:00
danni boi
90168d8d23 please be nice daddy github, we just want to fix indents 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-28 15:35:47 +01:00
danni boi
824b3c4cfc tab indents r e e 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-28 15:27:49 +01:00
danni boi
bcee469b58 tab indents r e e 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-28 15:27:40 +01:00
danni boi
e633a7a20d tab indents r e e 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-28 15:27:31 +01:00
danni boi
c9d5e525b7 tab indents r e e 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-28 15:27:19 +01:00
variableundefined
fba7585b4e Revert "Increases most radiation dose amounts" (#16445) 2021-07-28 10:11:27 +01:00
SabreML
e0d15d0f79 Trait Define Refactor (#16327) 
* Adminordrazine fix

* Trait Define Refactor

* Fixes 1

* target.status_traits
 2021-07-27 19:30:00 -04:00
variableundefined
4915b39230 Merge pull request #16303 from FlattestGuitar/blur-me-up-scotty 
Stab your eyes out with style
 2021-07-26 21:50:35 -04:00
variableundefined
09a5988ce2 Merge pull request #16147 from S34NW/rad_damage_normalise 
Increases most radiation dose amounts
 2021-07-25 09:15:40 -04:00