 Ghom
|
2bf27e84e6
|
Merge pull request #10709 from Seris02/mammaltoxin
Adds mammal mutation toxin to green slime extract recipes
|
2020-01-28 04:06:01 +01:00 |
|
|
kevinz000
|
5110a08817
|
Merge pull request #10737 from Ghommie/Ghommie-cit531
Refactoring APTFT altclick/verb options into flags
|
2020-01-27 17:44:20 -07:00 |
|
|
kevinz000
|
8f26325822
|
more stuff
|
2020-01-26 21:05:51 -07:00 |
|
|
Seris02
|
e45cc4933c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
|
2020-01-27 08:33:38 +08:00 |
|
|
kevinz000
|
41f9669a83
|
Update other_reagents.dm
|
2020-01-26 13:29:55 -07:00 |
|
|
Ghommie
|
41ee00b7df
|
Refactoring APTFT altclick/verb options into flags
|
2020-01-26 18:53:16 +01:00 |
|
|
Hatterhat
|
ff2785f24b
|
boy i hope this fucking compiles
|
2020-01-26 02:47:41 -06:00 |
|
|
kevinz000
|
776729797d
|
Update holder.dm
|
2020-01-25 05:56:32 -07:00 |
|
|
kevinz000
|
f199b720aa
|
Merge pull request #10689 from Ghommie/Ghommie-cit524
Even more runtime fixes.
|
2020-01-25 05:54:20 -07:00 |
|
|
kevinz000
|
72cfd35438
|
Merge pull request #10684 from Ghommie/Ghommie-cit521
fix for hypospray jank.
|
2020-01-25 05:53:42 -07:00 |
|
|
kevinz000
|
72a8096137
|
Merge pull request #10683 from Ghommie/Ghommie-cit520
A few consistencies for those "shoes" that don't actually cover feet.
|
2020-01-25 05:53:26 -07:00 |
|
|
Seris02
|
15874ea50f
|
mammal mutation toxin
|
2020-01-25 17:16:13 +08:00 |
|
|
kevinz000
|
ea65dfa631
|
iron undocumneted reagent change
|
2020-01-24 21:32:55 -07:00 |
|
|
kevinz000
|
147c0d8852
|
Merge pull request #10680 from Ghommie/Ghommie-cit518
snowflake-friendly towels.
|
2020-01-24 16:15:27 -07:00 |
|
|
kevinz000
|
a52b4feaba
|
Update glass.dm
|
2020-01-24 16:04:50 -07:00 |
|
|
Artur
|
e360ac1d36
|
Conflict fix
|
2020-01-24 23:06:32 +01:00 |
|
|
kevinz000
|
57c77a4f30
|
typo
|
2020-01-24 13:14:53 -07:00 |
|
|
Ghom
|
d5daae98c7
|
Merge pull request #9905 from Trilbyspaceclone/glassware
[Ready] Cargo MK III - Glassware Addtion
|
2020-01-24 18:46:25 +01:00 |
|
|
kevinz000
|
3b51c0dbe9
|
how did i get maintainer again
|
2020-01-24 04:48:24 -07:00 |
|
|
kevinz000
|
73975aec2b
|
pls compile i didn't webedit that last commit please forgive my sins!!
|
2020-01-24 04:39:51 -07:00 |
|
|
kevinz000
|
fc684da88d
|
more reasonable
|
2020-01-24 04:31:54 -07:00 |
|
|
kevinz000
|
93a27d05b4
|
Revert "nvm"
This reverts commit 5832b4d9b0.
|
2020-01-24 04:22:24 -07:00 |
|
|
kevinz000
|
5832b4d9b0
|
nvm
|
2020-01-24 04:21:41 -07:00 |
|
|
kevinz000
|
1043be4fd7
|
Update holder.dm
|
2020-01-24 04:14:43 -07:00 |
|
|
kevinz000
|
d2a23ef403
|
Update holder.dm
|
2020-01-24 04:11:37 -07:00 |
|
|
kevinz000
|
831ac91917
|
Merge pull request #10073 from Ghommie/Ghommie-cit435
Ports timestop and sepia extracts improvements/tweaks.
|
2020-01-24 00:25:53 -07:00 |
|
|
Ghommie
|
bd6e364612
|
But wait, there is more!
No...
|
2020-01-24 04:33:55 +01:00 |
|
|
Ghommie
|
1ba4c19c64
|
A couple more.
|
2020-01-24 03:50:44 +01:00 |
|
|
Ghommie
|
67f58b8a59
|
A few more runtime fixes.
|
2020-01-24 03:30:34 +01:00 |
|
|
Seris02
|
9761d68f4b
|
more merge conflict fixes
|
2020-01-24 10:14:31 +08:00 |
|
|
Ghommie
|
9ee70c7931
|
Travis is just faster at compiling, I can work on other things meanwhile
|
2020-01-24 02:34:32 +01:00 |
|
|
Ghommie
|
ba2c149d4d
|
Improvements.
|
2020-01-24 02:22:32 +01:00 |
|
|
Ghommie
|
6b62aef86c
|
Missing !
|
2020-01-24 02:19:52 +01:00 |
|
|
Ghommie
|
524f665f4a
|
fix for hypospray jank.
|
2020-01-24 02:17:41 +01:00 |
|
|
Ghommie
|
05150e821e
|
A few consistencies for those "shoes" that don't actually cover feet.
|
2020-01-24 01:25:23 +01:00 |
|
|
Ghommie
|
c8bf148216
|
snowflake-friendly towels.
|
2020-01-24 00:06:07 +01:00 |
|
|
Trilbyspaceclone
|
9466b0f4ca
|
Merge branch 'master' into glassware
|
2020-01-23 13:31:04 -05:00 |
|
|
Seris02
|
74be93a8cc
|
hasSiliconAccessInArea vars change
|
2020-01-21 11:44:49 +08:00 |
|
|
Seris02
|
c2bcbe868e
|
merge conflicts + getting rid of commented code for now
|
2020-01-21 11:23:33 +08:00 |
|
|
Ghom
|
3c53619f2a
|
Merge pull request #10616 from Citadel-Station-13/kevinz000-patch-15
Renames created volume in pyrotechnics to multiplier to alleviate confusion
|
2020-01-21 03:05:22 +01:00 |
|
|
kevinz000
|
efe3ebdb53
|
bet
|
2020-01-20 17:50:07 -07:00 |
|
|
Trilbyspaceclone
|
ab464de0b7
|
Update glass.dm
|
2020-01-20 16:10:12 -05:00 |
|
|
Artur
|
f5ad854c2c
|
Conflict fix
|
2020-01-20 13:50:52 +02:00 |
|
|
Seris02
|
a100f9382e
|
better, there, happy now github
|
2020-01-20 14:51:53 +08:00 |
|
|
kevinz000
|
f85527ab4b
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 16:18:12 -07:00 |
|
|
kevinz000
|
088e586b47
|
Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
|
2020-01-19 16:10:56 -07:00 |
|
|
kevinz000
|
0b0a6429ea
|
Update pyrotechnics.dm
|
2020-01-19 13:31:11 -07:00 |
|
|
Ghom
|
536900a7ac
|
Merge pull request #10520 from Hatterhat/tg-40920
you like examining things? - port of tgstation 40920
|
2020-01-19 16:37:40 +01:00 |
|
|
Seris02
|
718ff58e0b
|
fixes + advanced injectors
|
2020-01-19 15:17:57 +08:00 |
|
|
Hatterhat
|
590d71ddc1
|
hey ghom i fixed it i think
|
2020-01-18 23:35:52 -06:00 |
|