BongaTheProto
5116acad15
Merge remote-tracking branch 'upstream/master'
2023-05-06 18:31:55 -05:00
SandPoot
7038059ab5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-05-06 10:47:06 -03:00
KrissKr0ss
66aa1cb05c
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
...
This reverts commit 48e713ff33efb2d19cb9
2023-05-01 00:16:20 -05:00
Darius
f2cf15c590
Refactor Dumb For Cum quirk
...
This commit makes the following changes
- Adds comments
- Adds trait TRAIT_DUMB_CUM
- Adds mood quirk flag
- Adds quirk removal code
- Removes non-modular edits
- Renames trait TRAIT_DUMB4CUM to TRAIT_DUMB_CUM_CRAVE
- Removes interaction blocks
- Removes useless return functions
- Updates flavor text
- Updates variable names
- Changes reagent process to check for trait before triggering uncrave
- Changes on_spawn event to add event
2023-02-02 17:21:54 -05:00
Darius
59b3c5bd7a
Merge branch 'master' into quirk-bloodfledge-overhaul
2023-01-17 19:51:27 +00:00
BongaTheProto
596ab81dd0
Merge remote-tracking branch 'upstream/master'
2023-01-16 01:06:20 -05:00
SandPoot
0fe80e9234
Puts span defines on sandstorm's strings ( #284 )
2023-01-15 00:40:48 -03:00
Darius
56e43c9879
Bloodsucker Fledgeling overhaul
...
This commit refactors most of bloodfledge's code, adjusts balance, and adds new features. See the associated PR for full details.
2023-01-13 05:06:31 -05:00
Timothy Teakettle
c8fc27fc9c
Merge pull request #15930 from SandPoot/reskinning
...
Update to reskinning
2023-01-11 01:00:35 +00:00
BongaTheProto
d6aa3acbd4
Merge remote-tracking branch 'upstream/master'
2023-01-09 17:08:06 -05:00
SandPoot
2a772c8482
Adds the commando skin from ror & ror2 to the mining hardsuit ( #280 )
...
* first commit with everything
* quick fix and little extra usage!
* the boy
* previous could break
* better head
2023-01-09 18:55:07 -03:00
SandPoot
d743096f8a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-09 17:50:19 -03:00
SandPoot
f2a49bc319
first commit with everything
2023-01-08 21:36:57 -03:00
Jerry Wester
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
SandPoot
82eff346c7
Merge Upstream
2023-01-07 22:52:22 -03:00
silicons
23327fa268
Merge pull request #15894 from JerryWester/modsuits
...
MODsuits
2023-01-07 14:07:28 -08:00
Darius
39ff3eeb2f
Refactor cursed blood effect into modular
...
Moves TRAIT_CURSED_BLOOD effects into modular code. Makes change to holy water and blood drunk miner.
2022-12-18 18:26:38 -05:00
Jerry Wester
13f8559190
add springlock module
2022-12-17 16:54:41 -07:00
BongaTheProto
a04476b38d
Merge remote-tracking branch 'upstream/master'
2022-12-16 20:39:53 -05:00
SandPoot
011dd2e817
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-16 16:47:19 -03:00
Lin
7d0c3df2ad
Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
...
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
BongaTheProto
ee6823c69b
Merge remote-tracking branch 'upstream/master'
2022-12-13 12:14:11 -05:00
SandPoot
f4b7513f10
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-13 01:35:33 -03:00
Lin
7205781c47
Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
...
Solves some harddels
2022-12-12 19:11:49 -07:00
SandPoot
8911fe5e0b
clear em
2022-12-11 17:58:45 -03:00
Nukechickenu64
37fd47d8f7
modulizing 6
...
should be the final commit that modulizes as much as possible
2022-10-05 18:44:50 -04:00
Nukechickenu64
9d91bd48bd
value fix
...
simple value fix
2022-10-05 01:16:55 -04:00
Nukechickenu64
e6928f01ef
Merge remote-tracking branch 'upstream/master' into nukechickens_forge
2022-10-03 20:40:23 -04:00
Nukechickenu64
94759db4c8
Bloodsucker Fledgeling quirk and quirk ability section in code
...
adds a vampiric quirk that makes you only be able to gain nutrients from blood and be able to bite, along with their problems, also adds section to add in abilities for neutral quirks
2022-10-01 20:04:53 -04:00
BongaTheProto
9cdaffc417
Merge remote-tracking branch 'upstream/master'
2022-09-18 23:40:20 -05:00
SandPoot
cc9c36bd13
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-17 22:48:51 -03:00
Zirok
42b0733cf7
Fix a runtime with mkII hypospray injections
...
INDIVIDUAL_ATTACK_LOG is not a valid category, so this just runtimes.
Since this is already being logged above I decided to just cut this.
2022-09-16 21:06:36 +02:00
Putnam3145
e1cfa92080
fixes the worst use of a for loop ever
2022-09-13 23:19:12 -07:00
BongaTheProto
3341812b44
Merge remote-tracking branch 'upstream/master'
2022-08-20 17:16:19 -05:00
SandPoot
550db1b6ee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-20 17:27:19 -03:00
Putnam3145
9998ca7a10
another funny space cleaner gas buff
2022-08-18 23:54:01 -07:00
Putnam3145
c8a84c2172
forgot the ..()
2022-08-15 23:42:42 -07:00
Timothy Teakettle
835323bdbc
neurine fixes your traumas, yo!
2022-08-09 12:07:09 +01:00
Putnam3145
cdcdc11d9b
more space cleaner per space cleaner
2022-08-07 22:05:37 -07:00
Putnam3145
cda032a2dc
this wasn't even a copy+paste error, it's unaccountable
2022-08-06 22:53:00 -07:00
Putnam3145
c0073370b2
more chem gases
2022-08-06 22:42:58 -07:00
Putnam3145
f7bb3f3050
makes drying agent a chem gas
2022-08-06 16:08:55 -07:00
BongaTheProto
811c1df810
Merge remote-tracking branch 'upstream/master'
2022-07-24 12:05:49 -05:00
SandPoot
0a0e4de14b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-07-24 02:59:28 -03:00
Cognition
70dbad7055
Tea dispensing fix
2022-07-22 12:19:54 -06:00
WoolyAypa
9c94cad910
modularization and removed the is_dumb4cum proc
2022-06-17 14:03:48 -03:00
WoolyAypa
af3df23c49
dumb4cum that is
2022-06-17 02:46:28 -03:00
BongaTheProto
2e8d1a3566
fixes tea
2022-06-04 21:22:42 -05:00
BongaTheProto
53fa6873d1
Merge remote-tracking branch 'upstream/master'
2022-06-02 09:57:31 -05:00
SandPoot
d1c44afdae
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-01 19:21:46 -03:00
