silicons
|
ec72015f4f
|
Merge pull request #12809 from BlackMajor/borgo
Gripper brained. The medborg can do chemistry now, oh no.
|
2020-07-23 10:35:16 -07:00 |
|
silicons
|
dad3d38933
|
Merge pull request #12869 from timothyteakettle/zombies-rework
the very much needed zombie buffs
|
2020-07-23 10:29:43 -07:00 |
|
Timothy Teakettle
|
f5ac0b5762
|
some fixes
|
2020-07-23 18:10:46 +01:00 |
|
timothyteakettle
|
a5945d3dc2
|
slight zombie tweaking
|
2020-07-23 01:09:09 +01:00 |
|
Timothy Teakettle
|
aea268548c
|
some fixes
|
2020-07-21 19:54:42 +01:00 |
|
Timothy Teakettle
|
75a2035774
|
Merge branch 'master' into wound-port
|
2020-07-21 01:10:51 +01:00 |
|
Lin
|
f7355dde62
|
Merge pull request #12728 from silicons/vote
"I didn't see the map vote" - Adds a stat vote panel for plurality and approval voting as an alternative to the regular popups.
|
2020-07-20 18:17:45 -05:00 |
|
BlackMajor
|
f265b85d3b
|
Merge pull request #12810 from lolman360/master
service borg fix/tweak
|
2020-07-20 11:42:59 +12:00 |
|
Timothy Teakettle
|
1b99cb9201
|
everything has the bonesetter
|
2020-07-19 18:32:44 +01:00 |
|
Timothy Teakettle
|
ca6b289da6
|
fix tables and some minor thing
|
2020-07-19 17:49:22 +01:00 |
|
Timothy Teakettle
|
1a5008fee7
|
Merge branch 'master' into wound-port
|
2020-07-18 23:06:49 +01:00 |
|
Lin
|
ba3dc6a73b
|
Merge pull request #12679 from silicons/unarmed_parry
Ok ok hear me out: Implements unarmed parry.
|
2020-07-18 17:02:02 -05:00 |
|
Timothy Teakettle
|
345c5c593d
|
everyone but slimes can scar basically
|
2020-07-18 22:31:52 +01:00 |
|
Timothy Teakettle
|
f290050a78
|
Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port
|
2020-07-18 22:02:24 +01:00 |
|
Timothy Teakettle
|
b184cfefc5
|
imagine allowing wound healing
|
2020-07-18 22:00:28 +01:00 |
|
Timothy Teakettle
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
Timothy Teakettle
|
fe79c53f04
|
bugfixes
|
2020-07-18 21:40:19 +01:00 |
|
Lin
|
e165524763
|
Merge pull request #12803 from Citadel-Station-13/silicons-patch-32
removes tango dancing
|
2020-07-18 11:17:42 -05:00 |
|
lolman360
|
55ed77a89d
|
Update robot_modules.dm
|
2020-07-18 16:15:47 +10:00 |
|
lolman360
|
f84b044f34
|
Update robot_modules.dm
|
2020-07-18 16:05:57 +10:00 |
|
BlackMajor
|
f68962e9d3
|
This is a bad idea
|
2020-07-18 16:46:08 +12:00 |
|
timothyteakettle
|
e8fade4f7f
|
changes
|
2020-07-18 02:29:12 +01:00 |
|
timothyteakettle
|
8bb9b11922
|
Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port
|
2020-07-18 01:26:41 +01:00 |
|
timothyteakettle
|
7714fcfaba
|
more changes
|
2020-07-18 01:26:38 +01:00 |
|
silicons
|
655afda020
|
Merge pull request #12780 from BlackMajor/borgo
Even more engiborg power creep
|
2020-07-17 17:08:23 -07:00 |
|
Timothy Teakettle
|
93b4570f8d
|
more changes
|
2020-07-17 23:23:47 +01:00 |
|
Timothy Teakettle
|
a4478b0cda
|
it continues
|
2020-07-17 22:38:28 +01:00 |
|
silicons
|
a2c3643e20
|
fix
|
2020-07-17 12:46:32 -07:00 |
|
silicons
|
cc6079d413
|
Update human_movement.dm
|
2020-07-17 09:10:03 -07:00 |
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
silicons
|
e03948dcba
|
Merge pull request #12229 from Arturlang/TGUI-3.0
[READY]TGUI 3.0
|
2020-07-16 17:28:42 -07:00 |
|
Timothy Teakettle
|
ebd648c03d
|
name edgecase too
|
2020-07-16 18:32:24 +01:00 |
|
Timothy Teakettle
|
a8a495c0ac
|
rewrites pickle handling
|
2020-07-16 18:22:58 +01:00 |
|
Artur
|
9e73788714
|
Gah
|
2020-07-16 17:40:05 +03:00 |
|
BlackMajor
|
fc909cd7c6
|
Added material sheets and tiles. This took more work than you'd think.
|
2020-07-17 01:17:54 +12:00 |
|
Arturlang
|
92ed5d3201
|
Merge branch 'master' into TGUI-3.0
|
2020-07-16 15:59:37 +03:00 |
|
Artur
|
af65b626e3
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-16 15:56:08 +03:00 |
|
Letter N
|
2afab07b4a
|
https://github.com/tgstation/tgstation/pull/52255
|
2020-07-16 20:05:37 +08:00 |
|
timothyteakettle
|
8bfc30c8ac
|
i can't spell
|
2020-07-16 02:54:31 +01:00 |
|
timothyteakettle
|
03bd806c73
|
pickle
|
2020-07-16 02:51:07 +01:00 |
|
Timothy Teakettle
|
a7e2668eff
|
funniest
|
2020-07-15 23:50:39 +01:00 |
|
silicons
|
6121cbd091
|
Merge pull request #12738 from timothyteakettle/travelling-traders
the travelling trader midround event
|
2020-07-15 08:50:20 -07:00 |
|
BlackMajor
|
bd7c9d11d3
|
oh no
|
2020-07-16 02:02:29 +12:00 |
|
Artur
|
d0f1a805e4
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-14 16:15:48 +03:00 |
|
silicons
|
c333a71c74
|
Update life.dm
|
2020-07-14 04:30:38 -07:00 |
|
Lin
|
55c4e40fbb
|
Merge pull request #12706 from silicons/records
adds security/medical records to character setup
|
2020-07-13 11:50:02 -05:00 |
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|
Timothy Teakettle
|
29628dd82a
|
cows
|
2020-07-12 21:40:16 +01:00 |
|
Timothy Teakettle
|
c1592ad162
|
more rewards
|
2020-07-11 23:27:29 +01:00 |
|
Lin
|
e87653f781
|
Merge pull request #12594 from Citadel-Station-13/silicons-patch-3
what if you could override the entire say verb/emphasis system to audibly emote with ! like in baycode servers
|
2020-07-11 16:00:39 -05:00 |
|