 Putnam
|
e7684f5df7
|
whoops forgot to use sensitivity
|
2020-01-05 19:29:23 -08:00 |
|
|
Putnam
|
fba7a8abb0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-05 19:12:28 -08:00 |
|
|
Putnam
|
d75a525b3c
|
let's fix arousal huh
|
2020-01-05 19:10:48 -08:00 |
|
|
Ghommie
|
75d47c2a0d
|
Improves the set_APTFT verb into a proc.
|
2020-01-05 23:51:42 +01:00 |
|
|
Ghom
|
869ed7a4aa
|
Merge pull request #10427 from Hatterhat/beakers-but-quirky
beaker tweaks: setting transfer values verb on altclick, value tweaks
|
2020-01-05 23:08:23 +01:00 |
|
|
Ghom
|
a8741a8462
|
As you command.
|
2020-01-05 23:01:35 +01:00 |
|
|
Ghommie
|
592422ee70
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-05 22:53:00 +01:00 |
|
|
Trilbyspaceclone
|
c0f38aa27f
|
Update food_reagents.dm
|
2020-01-05 11:40:58 -05:00 |
|
|
Ghom
|
fdff70b702
|
Merge pull request #10256 from Putnam3145/alcohol-intolerance
Adds an alcohol intolerance trait (NOT light drinker)
|
2020-01-05 15:19:48 +01:00 |
|
|
Ghom
|
0e74c94d8c
|
Merge pull request #10278 from Trilbyspaceclone/patch-248
Fixes Fermi plushie reaction. Removes carbonation of caramel
|
2020-01-05 15:17:14 +01:00 |
|
|
Ghom
|
ca8d93ad17
|
Merge branch 'master' into alcohol-intolerance
|
2020-01-04 23:17:55 +01:00 |
|
|
Ghommie
|
686a76dd1d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-04 13:35:05 +01:00 |
|
|
Hatterhat
|
e65583c403
|
set_AFTFT verb, tweaking shit
|
2020-01-04 00:44:01 -06:00 |
|
|
Ghommie
|
f5b251db66
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-03 18:24:39 +01:00 |
|
|
Trilbyspaceclone
|
2931cb6757
|
Merge branch 'master' into glassware
|
2020-01-02 20:30:20 -05:00 |
|
|
Lin
|
b1ccd512db
|
Merge pull request #10215 from Ghommie/Ghommie-cit473
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
|
2020-01-03 00:00:51 +00:00 |
|
|
Lin
|
4b7e6ec2a5
|
Merge pull request #10270 from Ghommie/Ghommie-cit489
randomized recipes fallback fix.
|
2020-01-02 23:56:43 +00:00 |
|
|
Ghommie
|
4d06d231f8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-02 17:49:01 +01:00 |
|
|
kevinz000
|
16172f68aa
|
Merge pull request #10366 from Hatterhat/beaker-buff
beaker buff - alt title fuck hypovials and fuck making them free and better alternatives to beakers
|
2020-01-01 22:07:40 -08:00 |
|
|
Hatterhat
|
200de62b8e
|
tweaks transfer amounts, uncucks hypovials
|
2020-01-01 08:50:15 -06:00 |
|
|
Ghom
|
4660465115
|
Merge pull request #10362 from Trilbyspaceclone/patch-258
Corrects bottle/pill/patch/condiments "#$39;"
|
2019-12-31 14:39:34 +01:00 |
|
|
Ghom
|
78e4c608ad
|
Merge pull request #10319 from Seris02/coconutsyep
porting azarak's coconuts from hyper station
|
2019-12-31 13:16:07 +01:00 |
|
|
Seris02
|
54f859fe06
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2019-12-31 17:52:49 +08:00 |
|
|
Hatterhat
|
dcb5c58784
|
hypovial users dont deserve rights
|
2019-12-30 22:33:40 -06:00 |
|
|
Hatterhat
|
dc339b6962
|
beaker capacity buff
|
2019-12-30 22:24:41 -06:00 |
|
|
Trilbyspaceclone
|
ea43069222
|
Update chem_master.dm
|
2019-12-30 18:05:34 -05:00 |
|
|
Ghommie
|
49f1176170
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-30 16:06:16 +01:00 |
|
|
kevinz000
|
eb00538843
|
Merge pull request #10331 from Trilbyspaceclone/patch-254
Buffs borg hypo's
|
2019-12-30 00:20:35 -08:00 |
|
|
TrilbySpaceClone
|
5fbe7fcc2b
|
last touches
|
2019-12-29 04:54:31 -05:00 |
|
|
Trilbyspaceclone
|
75a24449c8
|
Update borghydro.dm
|
2019-12-28 21:36:21 -05:00 |
|
|
Ghommie
|
f93077e730
|
F to pay respect.
|
2019-12-29 00:08:34 +01:00 |
|
|
TrilbySpaceClone
|
8aee20cdf3
|
Ready
|
2019-12-28 17:55:20 -05:00 |
|
|
Ghommie
|
37441437d1
|
a
|
2019-12-28 23:02:28 +01:00 |
|
|
Seris02
|
862acf2f06
|
ports hyper's genetics
|
2019-12-28 21:33:15 +08:00 |
|
|
Trilbyspaceclone
|
3177b5786a
|
Update food_reagents.dm
|
2019-12-28 05:26:46 -05:00 |
|
|
Seris02
|
4a2b7c2438
|
cocooooonuuuuuuts
|
2019-12-28 16:02:53 +08:00 |
|
|
Ghommie
|
21cfb2914b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-27 17:49:59 +01:00 |
|
|
Ghommie
|
b4c0433d6d
|
more work.
|
2019-12-27 17:45:19 +01:00 |
|
|
kappa-sama
|
e97ca5f924
|
yeah fair enough
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-12-26 14:22:03 -05:00 |
|
|
kappa-sama
|
4689d805a3
|
e
|
2019-12-26 02:54:38 -05:00 |
|
|
Putnam
|
88222c0901
|
uh, actually did that
|
2019-12-24 23:58:22 -08:00 |
|
|
Putnam
|
0b1b249eba
|
just makes alcohol toxic rather than drunk-inducing
|
2019-12-24 23:53:33 -08:00 |
|
|
Ghommie
|
57cecd2499
|
work
|
2019-12-25 06:54:44 +01:00 |
|
|
Ghommie
|
53d142b4c0
|
more work.
|
2019-12-25 01:34:33 +01:00 |
|
|
Trilbyspaceclone
|
ca387d2bdb
|
Update others.dm
|
2019-12-23 20:51:37 -05:00 |
|
|
Ghommie
|
d571bbd292
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-24 00:07:32 +01:00 |
|
|
Ghommie
|
d88f50ac15
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-23 05:02:31 +01:00 |
|
|
Ghommie
|
e74339ce8b
|
Jfc that's a lot of work!
|
2019-12-23 04:24:13 +01:00 |
|
|
Ghommie
|
0b96e469dd
|
Oh shit.
|
2019-12-22 13:07:37 +01:00 |
|
|
Ghommie
|
9034980871
|
randomized recipes fallback fix.
|
2019-12-22 12:58:11 +01:00 |
|