4f5f56e68f
Merge pull request #13531 from DeltaFire15/quick-fix
...
Oops! Regenerate_bodyparts-edition
2020-10-10 15:33:59 -07:00
ad32b8f437
Merge pull request #13472 from timothyteakettle/slime-puddle
...
the pr that lets slimes turn into useless puddles
2020-10-10 11:14:25 -07:00
d8b39bcc5f
Merge pull request #13405 from silicons/tracer
...
warp implant is now infinite use and now actually reverts your position to 10 seconds before in time rather than use a snowflake chemical to teleport you 5 seconds later
2020-10-10 11:02:30 -07:00
a1ccc31877
fuck you travis
2020-10-10 18:05:31 +01:00
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
385bd57940
reworks family heirlooms, adds heirlooms that can be based off your species ( #13444 )
...
* corgi tracker
* better heirloom system
* typo
2020-10-10 12:15:39 +02:00
04db791004
Update human.dm ( #13491 )
2020-10-10 11:57:35 +02:00
f561389970
Merge pull request #13539 from timothyteakettle/eye-sprites
...
cleans up the eye customization pr
2020-10-08 10:05:30 -07:00
1fc7d9a21e
cleanup
2020-10-08 17:43:56 +01:00
d37d7bddae
Update jellypeople.dm
2020-10-08 04:20:42 +01:00
9d99061ff5
what the fuck git
2020-10-07 23:40:59 +01:00
e2c6a19da7
Merge branch 'master' into slime-puddle
2020-10-07 23:37:30 +01:00
64ee40b185
Merge pull request #13449 from Citadel-Station-13/silicons-patch-4
...
ok it turns out extools hooked procs do not play nice with call() or something so let's add admin proccall wrappers for some important atmospherics procs so i can flex the ability to undo atmospherics grief with one line of sdql2
2020-10-07 15:10:48 -07:00
3edc471012
Merge pull request #13517 from Citadel-Station-13/silicons-patch-11
...
"are you sure we should remove mobs from the immunity typecache" v2: electric boogaloo
2020-10-07 15:07:52 -07:00
eda0eda754
Update movement.dm
2020-10-07 10:46:00 -07:00
d2ce51ccb9
Merge pull request #13526 from Putnam3145/fix-vore-AGAIN-PLEASE
...
Adds a line that actually saves vore prefs to the vore pref saving
2020-10-06 17:06:08 -07:00
3557f00316
Merge pull request #13498 from deathride58/lingbloodupgrade
...
Lingblood rework (Loudness is now an average, rather than a sum)
2020-10-06 17:04:38 -07:00
efc4e089c9
Merge pull request #13503 from Hatterhat/glaive-knuckledagger
...
survival daggers, luxpod capsule resprite, glaive sprite tweaks soon (tm)
2020-10-06 17:03:44 -07:00
db6e5d86d8
Merge pull request #13504 from zeroisthebiggay/yeah
...
buffs stands in general, adds gravitokinetic stand type from tg, fixes broken protector shield
2020-10-06 17:03:16 -07:00
eae67e38f4
Merge pull request #13509 from EmeraldSundisk/helter
...
Slight adjustment to the "Skelter" ruin.
2020-10-06 17:02:24 -07:00
df2f086c42
Merge pull request #13519 from Detective-Google/licc
...
licking people is now an epic radial
2020-10-06 17:01:35 -07:00
c828bd586c
Merge pull request #13516 from yorii/patch-1
...
fixes rounding error in growthstages
2020-10-06 17:01:15 -07:00
bbc0dc982d
Merge pull request #13514 from Thalpy/JacqFixes2020edition
...
Jacq fixes2020edition
2020-10-06 17:00:39 -07:00
f6bbfc2c88
Merge pull request #13513 from timothyteakettle/eye-sprites
...
adds selectable eye types to customization
2020-10-06 16:51:44 -07:00
8eac1cb939
Merge pull request #13511 from Hatterhat/hakitavolver
...
additional revolver sprites
2020-10-06 16:51:18 -07:00
03a47bda6d
Merge pull request #13252 from timothyteakettle/loadout-loading
...
qol: looking at loadout equips your loadout items on you instead of job items
2020-10-06 16:50:08 -07:00
0d299684ed
oops!
2020-10-06 21:35:08 +02:00
5a517be5e7
thanks toriate
2020-10-06 12:47:00 -05:00
a1ea398283
Fixes vore saving once and for all.
2020-10-06 01:02:47 -07:00
655d505316
Merge pull request #13507 from LetterN/subsystem-updoots
...
Ports the better statpannel design, fixes missing icons, and fixes statvoting [ready]
2020-10-06 00:46:13 -07:00
2e7101fdc5
funny revolver sprites - squashed
2020-10-05 22:56:52 -05:00
f75b7a4f69
Errant comment
2020-10-06 00:22:38 +01:00
6cc34d7779
Sneaky spans
2020-10-06 00:06:09 +01:00
ab27d5dd30
few new barth items and span fixes
2020-10-05 23:42:00 +01:00
bf5f755440
Oops missed something
2020-10-05 23:29:37 +01:00
8301d3100c
updates lore, runes and tgui
2020-10-05 23:03:14 +01:00
915d2c726b
Merge pull request #13518 from TheObserver-sys/spritefixmaybe
...
Plant Sprite Fixes II: The Mycus must grow! (And the grass should die)
2020-10-05 10:21:37 -07:00
d4bc7bf562
unnessicary returns
2020-10-05 00:44:47 +01:00
0d0b9601be
Jacq can walk again!
2020-10-05 00:43:20 +01:00
e2ff214d6b
Justin hates catgirls
2020-10-04 22:31:10 +01:00
2840fe20b8
thank you kevinz
2020-10-04 16:06:19 -05:00
78cc2d95f3
licking people is now an epic radial
2020-10-04 15:55:02 -05:00
ce58fe4661
Update gas_mixture.dm
2020-10-04 09:46:14 -07:00
05aef528d7
finishing touches
2020-10-04 17:33:46 +01:00
6304a4010b
provisional chanterelle fix
2020-10-04 01:41:57 -04:00
16425912da
fairygrass-dead -> grass-dead
2020-10-04 01:14:03 -04:00
2e557b2f26
Update simple_animal.dm
2020-10-03 19:51:20 -07:00
42db9371de
fixes rounding error in growthstages
2020-10-04 03:47:01 +02:00
9faff5ecb6
Merge pull request #13461 from Detective-Google/arcade-carpets
...
adds arcade carpets
2020-10-03 18:07:44 -07:00
7586c38d52
Merge pull request #13487 from DeltaFire15/borg-KA-upgrade-fix
...
Fixes borg KA upgrade installation
2020-10-03 18:03:11 -07:00
Putnam3145