Commit Graph

66 Commits

Author SHA1 Message Date
psq95 cb43bf0dfc Label GS13 changes
Since commit 5084020 on Jan 30, 2023
2023-08-29 21:50:24 +01:00
GDLW 4fcf9826c0 Merge branch 'KabKebab:master' into random_junk 2023-03-16 18:05:23 +01:00
Sonoida 59cdacd0b5 lil fix
nothing worthwhile, just  keeping this for later
2023-03-12 19:39:45 +01:00
eyespy 3298f659b5 finishing what i started (and cake people!))
hopefully this fixes some bugs that were made present due to a botched PR I did a few days ago, as well as properly implementing craftable cake people (or cake golems, if you wanna call them that). sadly the code that was present when i tried to make my modifications for some reason does not give the person attempting to eat the cake person any nutriment or vitamins, so i would appreciate it if a more experienced coder gave me a hint on how to fix this, or just fixed it themselves.
2023-02-19 15:45:03 +11:00
Sonoida 79b156ca6b fixing someone's errors
what a goober, amirite
2023-02-16 17:53:28 +01:00
GDLW 34a89c1687 Merge pull request #61 from eyespy2222/testbranch
DID I HEAR A ROCK AND STONE?!?!?!!?!
2023-02-16 12:16:21 +01:00
eyespy 29756d756b Revert "Revert "DID I HEAR A ROCK AND STONE?!?!?!!?!""
This reverts commit 544605fca6.
2023-02-16 18:03:22 +11:00
eyespy 544605fca6 Revert "DID I HEAR A ROCK AND STONE?!?!?!!?!"
This reverts commit 99b80d9784.
2023-02-16 18:01:12 +11:00
eyespy 99b80d9784 DID I HEAR A ROCK AND STONE?!?!?!!?!
FOR KARL!!
2023-02-16 17:48:49 +11:00
Pinta 9fc2f81150 wew 2023-02-08 18:24:13 -05:00
Pinta 8b3ee4ffe3 wew 2023-02-07 21:02:19 -05:00
Sonoida 7bf4b20661 minor sprite fixes
minor sprite fixes: fatbeam hand sprites + changed command console palette
2022-11-15 17:55:21 +01:00
GDLW 46a27d6291 various lil additions and fixes
- new trait: lipolifier immunity (WIP version, possibly breaks corn oil gains)
- new event: lipolifier vent clog (WIP)
- removed cum vent clog events
- finished working on fatbeam (new sprites)
2022-11-07 17:38:56 +01:00
GDLW e32f20d90b more GATO reskins + fatbeam tests
changelog:
- swapped Kinaris mention with GATO in dreamstrings.txt
- swapped Kinaris mentions with GATO in redpill.json
- updated CC keycards to have GATO palette in card.dmi
- updated CC outfits to GATO palette in suits.dmi, uniforms.dmi and cloaks.dmi (partially, still unfinished)
- updated CC headsets/encryption key to GATO palette in radio.dmi
2022-10-30 16:04:09 +01:00
MrSky12 ad066ac5b7 Gatofication 10/10/2022 2022-10-10 12:29:23 +02:00
kevinz000 21c3b8e67b Merge pull request #9221 from Sishen1542/chappy
adds some new nullrods with some back end null rod refactors
2021-07-15 17:56:19 -03:00
kevinz000 865ff4fa08 Merge pull request #9610 from Ghommie/Ghommie-cit273
ports anti-magic component code updates (holymelon sold separately).
2021-07-15 17:43:18 -03:00
kevinz000 470cb0a588 Merge pull request #9587 from Ghommie/Ghommie-cit258
Porting components updates and fixing phantom thief component.
2021-06-25 21:06:34 -03:00
Archie f465a7cd61 Execution targets the right bodypart 2021-06-19 17:09:54 -03:00
QuoteFox 9cf0ca814b Revert "some fixes!"
This reverts commit 0c5effbc7b.
2021-03-20 19:01:30 +00:00
QuoteFox 0c5effbc7b some fixes!
some fixes!
2021-03-20 16:32:29 +00:00
Chloe Carver-Brown 7f7186dfd3 Unga weapons 2021-03-02 11:24:07 +00:00
Vladin 17b20e3a3e Sthefo.... stepo..... steto.... ssetho.....
THE THING YOU LISTEN TO THE HEART WITH DAMNIT
2021-01-29 16:06:02 -05:00
Archie ec3a68dc7a Runtime man bad 2021-01-19 18:09:23 -03:00
CygnusB 8ece699ed9 Merge branch 'master' into punishesarchie 2021-01-19 06:30:10 -03:00
CygnusB 958b01f4d0 part 2
forgot a bunch of shit, also had to re-do parts because we don't have update_overlays()
2021-01-19 06:09:55 -03:00
CygnusB f21db73775 fuck yeah
banana
2021-01-19 03:31:33 -03:00
Archie 464633af4c blood damage 2021-01-15 23:37:02 -03:00
Chemlight 358fb00492 Fixing personal code
Darn it with these /datum/ changes
2021-01-11 20:46:10 -08:00
Putnam3145 0db5aed986 Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
2021-01-05 16:51:22 -03:00
Lin b0779fe2d7 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2021-01-05 01:34:16 -03:00
Archie 3dde862df2 Delete runtimes 2021-01-04 03:02:42 -03:00
kevinz000 8e51c88d0e Porting Robustin's Syndicate Infiltrator PR from tee-gee 2021-01-02 16:53:52 -03:00
Chloe Carver-Brown c2a937bb73 Changing Nanotrasen to Kinaris where needed 2020-12-31 17:58:25 +00:00
kevinz000 10069637a5 Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
2020-12-30 00:42:50 -03:00
Lin a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -03:00
CygnusB ad8a067015 agonyyyy 2020-12-01 18:09:00 -03:00
kevinz000 4c02f20812 reorganizing 2020-11-22 06:03:48 -03:00
kevinz000 5eb8b535c3 Merge pull request #9505 from Thalpy/Smartdart-QoL
[READY] Tweaks smartdarts with a few quality of life functions, and add a few new things.
2020-11-17 00:31:16 -03:00
Chemlight 8c0f1756a1 Funny-character-bus-code
This little pull is litterally a pull for a single character I'd like to bus, basicly a walking chem dispenser, so lets go!
2020-11-09 23:03:12 -08:00
Dip 124bf72657 more runtimes, fixes wrong gibs and blood 2020-10-24 02:23:06 -03:00
Dip 9b7eee0a89 merge conflict 2020-10-18 16:54:22 -03:00
Dip 6163b7c963 GRUG SMASH RUNTIME 2020-10-18 04:34:21 -03:00
kevinz000 2e75188a0b Merge pull request #9688 from Ghommie/Ghommie-cit306
Fixing gibspawner runtimes and improving them, how gruesome...
2020-10-18 00:03:22 -03:00
deathride58 cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
Chemlight 5174ab881a X-01 MultiPhase Energy Gun Buff
Increased the charge capacity of the X-01's blaster by 60% along with it's charge capacity, allowing 16 lethal shots, 40 disabler, or 16 stun shots. Origionally the stun energy cost was at a whole 200 charge reduction , now being 100 to represent the power in comparison to a tactical energy gun that spent half the amount of energy in comparison.
2020-10-17 00:03:31 -07:00
Dip aa7d47a23b Examine Code Refactor 2020-10-06 23:36:21 -03:00
kevinz000 b8bc551d51 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-10-03 19:35:47 -03:00
Chemlight 6ad704e532 Round start Warden shotgun
"Due to unfortunate events with mishandling equipment in the security departments, we have exchanged the mutinition found in the compact shotgun found in the warden's locker due to a 'workplace hazard',"
2020-09-24 21:23:41 -07:00
BoxyBoy 5a7ac28c16 Adds a FAL
Adds code and spirtework for an FAL.
2020-07-03 17:52:58 -06:00