CygnusB
8cda8bbd16
Revert "Merge branch 'punishesarchie' of https://github.com/MalricB/Hyper-Station-13 into punishesarchie"
...
This reverts commit 1945c166b4 , reversing
changes made to c8d20ea83c .
2021-01-19 06:40:28 -03:00
CygnusB
8ece699ed9
Merge branch 'master' into punishesarchie
2021-01-19 06:30:10 -03:00
CygnusB
f6c3dccaf9
Revert "Update human.dm"
...
This reverts commit 713aa33fa8 .
2021-01-19 06:27:15 -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
Dahlular
9f0b22fa95
Code Cleanup + Cushions
2021-01-18 01:14:58 -07:00
QuoteFox
659550ff25
Fixed honey balls lable.
...
Fixed honey balls lable.
2021-01-17 11:59:34 +00:00
QuoteFox
a7f3a8dca3
Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13
2021-01-17 11:27:04 +00:00
QuoteFox
f1a9db058a
circuits exploit fix.
...
circuits exploit fix.
2021-01-17 11:26:54 +00:00
Dahlular
b8996b962d
Merge pull request #898 from Dahlular/ikeacargo
...
REEEEEEEEEEEEEEEEEE
2021-01-17 04:24:26 -07:00
Dahlular
4c02fcc06f
REEEEEEEEEEEEEEEEEE
2021-01-17 04:22:20 -07:00
Dahlular
0fa8bff364
Merge pull request #897 from Dahlular/ikeacargo
...
Carpentry Part 1
2021-01-17 04:17:39 -07:00
Dahlular
30cfdc1f22
makes it fucking buyable
2021-01-17 04:12:13 -07:00
QuoteFox
f806ffd48b
Merge pull request #891 from ArchieBeepBoop/cargo5
...
Small cargo crate revamp + QoL changes
2021-01-17 08:46:25 +00:00
QuoteFox
60889e985c
Merge pull request #894 from ArchieBeepBoop/lipo
...
Nerfing Lipolicide Overdose
2021-01-17 08:46:03 +00:00
QuoteFox
978862f3a6
Merge pull request #893 from ArchieBeepBoop/nerfrat
...
Boomrat explosion logging
2021-01-17 08:45:38 +00:00
QuoteFox
eabffc2ee5
Merge pull request #895 from ArchieBeepBoop/pandemic
...
Something about the Pandemic's UI Crashing
2021-01-17 08:45:16 +00:00
QuoteFox
76fca5514f
alien honey for breasts, and fixes the breast liquid.
...
alien honey for breasts, and fixes the breast liquid.
2021-01-17 02:13:18 +00:00
Archie
4ee3ea16e0
Fixes Pandemic UI Crash
2021-01-16 22:47:29 -03:00
Archie
887c32e0bd
Lipolicide overdose is too strong.
2021-01-16 22:36:21 -03:00
Archie
d3b8b1d1aa
Fixes
2021-01-16 22:15:05 -03:00
Archie
50822ed9b9
Synthetics can now speak slime
2021-01-16 18:44:43 -03:00
Archie
12fde70d0c
Cargo Changes Initial
2021-01-16 17:40:43 -03:00
Archie
41540397db
Fixes a bunch of fallout
2021-01-16 16:12:38 -03:00
Archie
098b0fc326
logv1
2021-01-16 14:39:54 -03:00
Dahlular
46ffd229c9
whoops
2021-01-15 23:17:04 -07:00
Dahlular
92054e8f0e
Merge pull request #887 from Dahlular/cargoupdates
...
New Cargo Crates, Moves Some Around
2021-01-15 22:49:59 -07:00
Dahlular
bb892c90e4
New Cargo Crates, Moves Some Around
...
Diminicillin + Prospacillin cargo crates, and moves some other crates around. Removes an offensive comment.
2021-01-15 22:38:24 -07:00
Archie
76ebc0f494
New sprite!
2021-01-16 01:11:46 -03:00
Archie
42c738879a
comment
2021-01-16 01:04:42 -03:00
Archie
5680049195
nerf the rat ™️
2021-01-16 00:58:43 -03:00
QuoteFox
0d23ec3ee7
Merge pull request #881 from ArchieBeepBoop/ratswearetherats
...
SS13 - The Rat Update (Store mice in Chef hats + Regal Rats)
2021-01-16 03:48:26 +00:00
Chloe Carver-Brown
31379b786f
Time to rrrumble
2021-01-16 03:14:07 +00:00
QuoteFox
83ae129c1b
Merge pull request #883 from lyricalpaws/master
...
Footwrap shoes
2021-01-16 02:53:22 +00:00
Chloe Carver-Brown
b49dc9536a
Adds footwraps as a roundstart and craftable shoe
2021-01-16 02:49:23 +00:00
QuoteFox
8fed311d04
Merge pull request #882 from ArchieBeepBoop/bloodfix
...
Bullets no longer do equal blood volume deletion to unmitigated damage
2021-01-16 02:39:27 +00:00
Archie
464633af4c
blood damage
2021-01-15 23:37:02 -03:00
QuoteFox
992e168cd6
hairfre
...
hairfre
2021-01-16 02:24:58 +00:00
Timothy Teakettle
5cca6129a5
Regal Rats + Mice in hat
2021-01-15 21:18:12 -03:00
QuoteFox
763fe5e716
Merge pull request #879 from ArchieBeepBoop/boomfix1
...
Boommouse no longer chews on wires
2021-01-15 20:36:31 +00:00
QuoteFox
9c1abdd9b4
Merge pull request #871 from Grant4455/master
...
Research fix for arcade machines and the Autoylathe
2021-01-15 20:36:18 +00:00
Archie
b3eecd427d
Makes boommouses not eat wires
2021-01-15 16:11:20 -03:00
QuoteFox
6dffcff818
Merge pull request #877 from Chemlight/Implants-and-maybe-some-cargo
...
Lots of bus implants and ATV supply n' demand
2021-01-15 18:32:32 +00:00
QuoteFox
8c3bb072ee
Merge pull request #876 from ArchieBeepBoop/examinecode
...
Small examine code change
2021-01-15 18:32:09 +00:00
QuoteFox
83567cf685
Ports techweb backend refactor & co.
...
from https://github.com/Citadel-Station-13/Citadel-Station-13/pull/9737
2021-01-15 18:28:36 +00:00
Chemlight
403f4336db
Lotsa bus implants and ATV supply n' demand
...
Since Krav maga has an implant to toggle it on and on, I thought lets add everything else! (Aside from boxing, that for example is just tied to boxing gloves).
Also ATV's are too easy to get, make it need effort to buy and become speed racer.
2021-01-15 04:25:16 -08:00
Archie
1466032728
Examine code mini fix
2021-01-15 04:00:47 -03:00
QuoteFox
4128a9fe78
fixes AI radio
...
fixes AI radio
2021-01-15 00:28:47 +00:00
QuoteFox
3c9ca835ab
Merge pull request #870 from lyricalpaws/master
...
Adds funny cat accent
2021-01-14 18:38:01 +00:00
Archie
4ce4e88398
Fixes some shit
2021-01-14 14:59:03 -03:00