c86124f8ed
Update human.dm
2020-03-10 14:34:17 +01:00
832d894e92
Merge pull request #11388 from Owai-Seek/crabby-patty-3/1/20
...
Food Ports / Butter Bear / Food Craft Speed
2020-03-10 05:59:24 -07:00
41fdaae32c
Merge pull request #11390 from zeroisthebiggay/ghosthudstaketwo
...
makes ghost hud default to on and ghost darkness defaults to on
2020-03-10 05:58:43 -07:00
e210f7d535
Merge pull request #11391 from Ghommie/Ghommie-cit612
...
Porting "Further update_icon splitup"
2020-03-10 05:58:17 -07:00
d3306e2eec
Merge pull request #11392 from zeroisthebiggay/hardsuithelmetsarenice
...
syndicate elite hardsuit helmet doesnt hide masks anymore
2020-03-10 05:57:27 -07:00
1b7eaf48eb
Merge pull request #11395 from Citadel-Station-13/Ghommie-patch-4
...
Shuttle timer display seconds fix
2020-03-10 05:56:56 -07:00
bfb75eb26b
Merge pull request #11396 from Ghommie/Ghommie-cit613
...
Ports "Switches out the three billion args of electrocute act for flags"
2020-03-10 05:56:28 -07:00
aca1d70bbb
Merge pull request #11397 from zeroisthebiggay/helmetsarenotheavy
...
syndicate contractor helmets are no longer secretly lead
2020-03-10 05:56:08 -07:00
39a949f223
remove that
2020-03-10 05:50:57 -07:00
e0df350579
PD now isn't a HoS taser x3 and has reasonable damage, stimulants actually combat the taser effect instead of you just being completely fucked by the HoS even through adrenals.
2020-03-10 23:21:59 +11:00
b03d83926a
Forgot the scroll
2020-03-10 20:27:40 +11:00
f41f78b162
Massively refactors martial arts, ports New Sleeping Carp
2020-03-10 20:09:31 +11:00
8a452b7f09
Food Craft Speed
2020-03-10 01:43:18 -04:00
9ec222e5b4
Empowered Burger
2020-03-10 00:53:42 -04:00
269b7c2939
k
2020-03-09 21:06:00 -07:00
bd2aa5f54b
Merge pull request #11402 from Ghommie/Ghommie-cit614
...
Porting more legcuffs / bola fixes etcetera
2020-03-09 21:01:51 -07:00
8a1b57f10b
k
2020-03-09 21:01:03 -07:00
f444020741
Merge pull request #11403 from Citadel-Station-13/Ghommie-patch-1
...
[s] Ports "Fixes gibber part update"
2020-03-09 19:28:02 -07:00
5a18d143a9
Removed extraneous apply_innate_effects
...
This one was caused by the hear proc overhaul.
2020-03-09 18:47:42 -07:00
f19647acc7
Fixed uplinks not being given to traitors.
...
Always remember to follow your code VERY CLOSELY or garbage like this happens. finalize_traitor calls traitor_kind.finalize_traitor(); that's how I intended it to happen. Instead, I foolishly wrote "traitor_kind.finalize_traitor()" in the on_gain() proc. I didn't notice for a LONG time, because... well, it's supposed to call finalize_traitor(), just not that one. The pitfalls of working with old code.
2020-03-09 18:47:06 -07:00
17007182c9
Merge branch 'Ghommie-cit604' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit604
2020-03-09 22:42:31 +01:00
80eaf3be0d
Update _drone.dm
2020-03-09 22:22:38 +01:00
0400fbf8a2
Update constructs.dm
2020-03-09 22:21:32 +01:00
0587d3482d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit604
2020-03-09 21:53:22 +01:00
8e030763b6
Odd but ok?
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-09 12:38:45 -04:00
29346f7827
Merge pull request #11371 from keronshb/BlobRefactor
...
Blob refactor + reroll ports
2020-03-09 17:07:45 +01:00
503827a0b6
Merge pull request #11382 from zeroisthebiggay/snowflakesyndicatecontractorshit
...
tauric contractor space suits
2020-03-09 16:50:32 +01:00
ea556e6357
[s] Ports "Fixes gibber part update"
2020-03-09 16:41:56 +01:00
4143c1963c
Porting more legcuffs / bola fixes etcetera
2020-03-09 16:20:51 +01:00
4968c22b5f
sprites!
2020-03-09 08:47:56 -04:00
68382d65c8
normalising wagging tail names
2020-03-09 17:48:12 +08:00
cccd0e9eef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-03-09 16:49:32 +08:00
3da09077ec
Merge pull request #11393 from Citadel-Station-13/Ghommie-patch-1
...
Webedit fixing bloodsucker mesmerize
2020-03-08 21:29:10 -07:00
c079dba753
its a fucking helmet
2020-03-08 23:07:24 -04:00
ee1eea8874
Ports "Switches out the three billion args of electrocute act for flags"
2020-03-09 04:01:23 +01:00
7e1e905a95
Line ending changes, I hope
...
here goes nothing.
2020-03-08 20:36:05 -04:00
f1d6360b70
Shuttle timer display seconds fix
2020-03-09 01:31:39 +01:00
0d3da4fcc0
maybe? last go? 2
...
Should be the final part I hope
2020-03-08 20:11:13 -04:00
94958581b9
maybe? last go?
...
maybe? last go?
2020-03-08 20:10:34 -04:00
fd1dc991ce
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor
...
Pne more test go
2020-03-08 19:48:30 -04:00
1c5aa2f933
Merge pull request #11377 from Kraseo/contractor-fixes
...
Some contractor adjustments & fixes
2020-03-09 00:26:54 +01:00
8878733fc1
Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI
...
Ports Skyrat's synths (Plus limb rendering overhaul and more)
2020-03-09 00:26:06 +01:00
7955ca4f8d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor
...
Trying to fix this shit again
2020-03-08 19:17:28 -04:00
1cd9c19b4c
Merge pull request #11288 from Trilbyspaceclone/patch-300
...
[ready] Craftable Prescription & Sunglasses HUDs
2020-03-09 00:01:12 +01:00
d460f5359e
Hopefully this will fix it?
...
Hopefully this will fix it?
2020-03-08 18:49:18 -04:00
9b63c7aa11
Trying to see if this will fix the line end issue
...
Trying to see if this will fix the line end issue
2020-03-08 18:48:42 -04:00
187de6869f
Webedit fixing bloodsucker mesmerize
2020-03-08 23:38:30 +01:00
388891bde3
fianlly ive discovered obanium
2020-03-08 18:31:12 -04:00
59b1a223a3
Ok, done.
2020-03-08 22:51:36 +01:00
0f14fbfdac
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor
...
To fixs something?
2020-03-08 17:51:17 -04:00
Ghom