timothyteakettle
|
e0f44ef717
|
new emps
|
2020-09-10 03:49:47 +01:00 |
|
BlackMajor
|
1943a2fdd7
|
Merge pull request #13246 from silicons/anomaly_manufacturing
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
|
2020-09-06 17:53:35 +12:00 |
|
silicons
|
12c5680d58
|
Merge pull request #13324 from Putnam3145/extools-logging
Added threaded extools logging as an alternative to rust_g logging.
|
2020-09-04 04:10:02 -07:00 |
|
Ghommie
|
dc9b024fae
|
Blemishes begone.
|
2020-09-02 19:16:16 +02:00 |
|
Putnam
|
2f3edb4491
|
Added threaded extools logging as an alternative to rust_g logging.
|
2020-08-31 19:56:49 -07:00 |
|
silicons
|
e677804bd7
|
Merge pull request #13277 from Chiirno/AnaPanRework
Reworks Anatomic Panacea
|
2020-08-29 21:19:47 -07:00 |
|
silicons
|
5f7d80eab2
|
Merge pull request #13281 from Putnam3145/examine-pref
Added genital/vore examine text prefs
|
2020-08-29 21:19:03 -07:00 |
|
Letter N
|
fe17bee28e
|
reverts thing kev said about
|
2020-08-29 14:36:41 +08:00 |
|
Letter N
|
ae482c1bb8
|
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
|
2020-08-29 14:09:56 +08:00 |
|
Putnam
|
c7883775fa
|
Added a pref to see genitals on examine.
|
2020-08-27 20:22:24 -07:00 |
|
Lynxless
|
828a65a7fd
|
New branch test
|
2020-08-27 15:46:40 -03:00 |
|
silicons
|
857c581931
|
Merge pull request #13232 from timothyteakettle/is-this-a-good-idea
adds the ability to pick body sprites (you can choose aquatic/avian sprites as anthromorphs!)
|
2020-08-27 09:55:26 -07:00 |
|
silicons
|
ec9b82381b
|
Merge pull request #13265 from timothyteakettle/rock-paper-scissors
adds rock paper scissors
|
2020-08-27 09:42:08 -07:00 |
|
silicons
|
ff6beea525
|
rebalances shotgun shell stripper clips since no one else wants to (#13116)
* Update volumetrics.dm
* Update ammo_boxes.dm
|
2020-08-26 17:19:29 +02:00 |
|
timothyteakettle
|
f908475617
|
rock paper scissors
|
2020-08-26 01:01:09 +01:00 |
|
silicons
|
b995581a11
|
changes
|
2020-08-23 05:33:19 -07:00 |
|
silicons
|
bd5766a8be
|
changes
|
2020-08-23 05:27:53 -07:00 |
|
silicons
|
7737e76b32
|
Merge pull request #13224 from Ghommie/Ghommie-cit835
Removing priority overlays, update_icon() splitup for guns.
|
2020-08-22 15:19:07 -07:00 |
|
Letter N
|
afe32406c0
|
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
|
2020-08-22 13:40:36 +08:00 |
|
Timothy Teakettle
|
cbe9d05fb6
|
fuck
|
2020-08-21 21:08:17 +01:00 |
|
Letter N
|
f04918bdca
|
working code?
|
2020-08-21 15:09:49 +08:00 |
|
silicons
|
120bcfc00c
|
Merge pull request #13178 from lolman360/plumb
[READY] ports plumbing (no more waiting for tgui4)
|
2020-08-20 21:32:26 -07:00 |
|
Ghom
|
1242626faa
|
Forgot the comment.
|
2020-08-20 19:01:13 +02:00 |
|
Ghommie
|
fde859bca0
|
Removing priority overlays, update_icon() splitup for guns.
|
2020-08-20 18:33:23 +02:00 |
|
Letter N
|
8d70e21239
|
the unexpected paperwork update. paperwork rp? And also includes ntnet upgrade because fuck it.
|
2020-08-20 19:40:47 +08:00 |
|
Letter N
|
2dd3d71b19
|
config©paste chang.
|
2020-08-20 16:36:24 +08:00 |
|
Letter N
|
3b7bca28b3
|
Functional* code
|
2020-08-20 13:50:33 +08:00 |
|
Putnam
|
81dc6c7ee5
|
Ports reftracking from TG.
|
2020-08-18 20:41:43 -07:00 |
|
silicons
|
0331f0cdc3
|
Merge pull request #13189 from timothyteakettle/revert-13187-revert-13110-cum
Revert "[TESTMERGE ONLY] FUCK"
|
2020-08-18 18:52:52 -07:00 |
|
silicons
|
f611945b34
|
Merge pull request #13180 from Detective-Google/glass-floors
ports multiz glass floors (tgstation/tgstation#50831)
|
2020-08-17 03:14:15 -07:00 |
|
Putnam3145
|
23b4ba3714
|
Merge pull request #13063 from silicons/supermatter
Ports /tg/ supermatter - no more infinite stunlock death on charge inertia delaminations
|
2020-08-17 03:13:14 -07:00 |
|
Timothy Teakettle
|
f5300750b5
|
Revert "[TESTMERGE ONLY] FUCK"
|
2020-08-17 03:18:36 +01:00 |
|
silicons
|
4cd731ce11
|
Revert "cease your shitcode: cum edition"
|
2020-08-16 19:06:57 -07:00 |
|
silicons
|
8dedcbcf76
|
Merge branch '13113'
|
2020-08-16 18:53:35 -07:00 |
|
silicons
|
690f610f62
|
Merge branch '13168'
|
2020-08-16 18:52:04 -07:00 |
|
silicons
|
397cdb6c03
|
Merge branch '13129'
|
2020-08-16 18:45:35 -07:00 |
|
Detective Google
|
016fd2ac3c
|
woo yeah yeah woo
|
2020-08-15 23:55:52 -05:00 |
|
MrJWhit
|
60446316bb
|
Update _flags.dm
|
2020-08-14 21:14:21 -04:00 |
|
lolman360
|
6f7badda41
|
Merge branch 'master' into plumb
|
2020-08-12 09:03:11 +10:00 |
|
ancientpower
|
99d73388f8
|
lets ghosts see the contents of closets
|
2020-08-11 16:40:03 -05:00 |
|
Timothy Teakettle
|
4a2bbe66d6
|
Merge branch 'master' into cum
|
2020-08-11 18:30:30 +01:00 |
|
silicons
|
a8d61b60ef
|
Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
adds a cybernetic eyepatch to the syndicate uplink
|
2020-08-11 01:47:32 -07:00 |
|
kiwedespars
|
eb8574d6d6
|
heretics from tg (with changes)
|
2020-08-10 19:17:26 -07:00 |
|
Timothy Teakettle
|
ef3b0fd936
|
no need for this repetition
|
2020-08-10 21:47:59 +01:00 |
|
Timothy Teakettle
|
033fe553e8
|
cease your shitcode
|
2020-08-10 21:41:06 +01:00 |
|
lolman360
|
308d77da7c
|
Merge branch 'master' into plumb
|
2020-08-09 22:48:18 +10:00 |
|
silicons
|
f20f01cc6b
|
Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
|
2020-08-09 05:46:21 -07:00 |
|
silicons
|
3068accd2b
|
Merge pull request #13082 from Putnam3145/anaphro
Removed (an)aphrodisiacs.
|
2020-08-09 05:39:56 -07:00 |
|
silicons
|
d25daec117
|
Merge pull request #13081 from Putnam3145/ethereals
Ports ethereals from TG
|
2020-08-09 05:39:43 -07:00 |
|
silicons
|
3acd4ac6de
|
Merge pull request #13069 from Chiirno/radioactive-port
Ports TG #51879 - Makes rads glow, buffs rad goggles
|
2020-08-09 05:35:08 -07:00 |
|