kappa-sama
036115eddb
wallets can hold keys
2019-08-25 15:45:47 -04:00
kevinz000
0eb1fdd9dc
Update mood.dm
2019-08-25 11:19:01 -07:00
Linzolle
3e782795dd
get up
2019-08-25 13:14:57 -05:00
Poojawa
1ba9d374fe
whatever, I guess
2019-08-25 01:19:16 -05:00
Linzolle
955fafee11
make it Work
2019-08-24 23:22:02 -05:00
Linzolle
14ba00d477
shakes my head
2019-08-24 22:21:46 -05:00
Linzolle
9651ae45b1
love to work with merge conflicts
2019-08-24 20:27:47 -05:00
Rob Bailey
5e94a5db80
ports #44155 from /tg/station
2019-08-24 20:21:44 -05:00
Poojawa
b01f135d3a
addresses a few concerns
2019-08-24 19:09:56 -05:00
TrilbySpaceClone
4878510c2b
Fixes that make this complie
2019-08-24 19:46:51 -04:00
TrilbySpaceClone
db317b65af
Grand!
2019-08-24 19:39:15 -04:00
Ghommie
24fe7126c4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-08-24 19:05:51 +02:00
Ghommie
5d1cac62da
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-08-24 13:50:22 +02:00
Ghommie
f843a53fe9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
2019-08-24 12:52:16 +02:00
Poojawa
d60ba0a207
Fixes missing DNA info for slimes, resolves virology issues
2019-08-24 04:14:47 -05:00
chefferz
3fcf9b329f
Update his_grace.dm
2019-08-23 21:46:04 -04:00
Sishen
20f4e260e1
minigun ooga
2019-08-23 19:39:20 -04:00
Sishen
3f86a92efa
Merge branch 'walk-like-an-egyptian' into walklikeanegyptian
2019-08-23 14:42:35 -04:00
Dap
a80dfada21
[WIP] Plasmaglass Tables!
...
## About The Pull Request
Hey hey people, now you can have pink tables. The scientists on SS13 have really out done themselves today. So far it drops regular glass shards, but tg already has plasma glass shards that I'll try to port once I get around to it.
## Why It's Good For The Game
New thing for people to make, basically a stronger table, but it still breaks when a player stands on it.
## Changelog
🆑
add: Plasmaglass tables
/🆑
2019-08-23 12:38:07 -06:00
Ghommie
2ce01b3bda
Removes an obnoxious temporary overlay var.
2019-08-23 19:57:57 +02:00
Ghommie
106cd7b845
Fixes "Blood Cult Conversion Prompt Issues"
2019-08-23 19:38:39 +02:00
chefferz
0f4f20c29a
Update buffs.dm
2019-08-23 03:50:28 -04:00
chefferz
788d616c76
Update his_grace.dm
2019-08-23 03:47:21 -04:00
chefferz
bd1dae9082
Update buffs.dm
2019-08-23 03:46:13 -04:00
chefferz
580ea38199
Update buffs.dm
2019-08-23 03:45:44 -04:00
Linzolle
62a51d8df5
infinite sword exploit
2019-08-23 01:25:46 -05:00
Linzolle
7a481f4354
TABS
2019-08-23 01:08:53 -05:00
chefferz
de4d4a990b
Updated weight class
...
Updated weight class per Bhjin's suggestion
2019-08-22 21:07:31 -04:00
deathride58
9a32d437a5
grants poly the ability to speak through the TGS relay (with a 0.01% chance)
2019-08-22 20:33:12 -04:00
chefferz
dca81de36c
Gives His Grace stamina regeneration
...
His Grace, the 20TC item, is meant to absorb stun damage. When it feeds on corpses, its hunger increases quickly and steadily, but the current stamina system makes it impossible to actually fight without stamcritting yourself and getting eaten.
This gives regeneration to where you can actually use His Grace in the later stages without suffering from exhaustion.
2019-08-22 20:09:52 -04:00
JTGSZ
e6dbaf8473
this should work
2019-08-22 13:02:01 -04:00
lolman360
c618ce114d
Ebb
2019-08-22 14:18:49 +10:00
lolman360
70581af613
Epic recipie moment.
2019-08-22 14:17:11 +10:00
deathride58
ea9eaedf1a
Ports BeeStation/BeeStation-Hornet#345
2019-08-21 22:16:44 -04:00
kevinz000
2f9ca28d38
this is bad performance and probably unnecessary but juuust in case..
2019-08-21 08:17:34 -07:00
kevinz000
25a7d3af51
Merge pull request #8968 from Trilbyspaceclone/patch-199
...
Fixes dead/used face huggers from still infecting
2019-08-21 08:16:06 -07:00
kevinz000
ba2a6d6626
Merge pull request #9145 from Trilbyspaceclone/patch-212
...
gives drones a RPD
2019-08-21 08:15:08 -07:00
kevinz000
7fe2d2b5f2
Merge pull request #9142 from Trilbyspaceclone/patch-211
...
removes glue from nukies/clownops uplinks
2019-08-21 08:11:44 -07:00
kevinz000
3f6256d945
Update all_nodes.dm
2019-08-21 08:06:08 -07:00
kevinz000
3c59b43ff7
Update shotgun.dm
2019-08-21 06:39:18 -07:00
Poojawa
32c7a7c3ee
Virology's broken as fuck, damnifino why
2019-08-21 03:36:40 -05:00
Poojawa
b29607c019
It's working again, I guess. wtf
2019-08-21 01:36:59 -05:00
kevinz000
2f39bb3d56
Update necropolis_chests.dm
2019-08-20 21:59:50 -07:00
kevinz000
c694248f5a
Update necropolis_chests.dm
2019-08-20 21:58:48 -07:00
Poojawa
23333f6ea5
reverts the majority of clean act because it doesn't work properly otherwise
2019-08-20 23:03:31 -05:00
TrilbySpaceClone
044ef51dfa
Relies on a PR
2019-08-20 18:32:39 -04:00
Poojawa
bda3ac8745
blood dna is fixed, your ERP code is too
2019-08-20 07:41:50 -05:00
Poojawa
96834bc517
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-20 03:36:17 -05:00
Seris02
4fbbed3a43
adds looc hotkey
2019-08-20 14:32:48 +08:00
Sishen
7a8e2c3f50
rebalances the lawyer heirloom briefcase while giving it a fancy new sprite
2019-08-19 17:54:16 -04:00
