 Ghom
|
fb32b018ef
|
Merge pull request #10838 from Owai-Seek/loadout
Minor Loadout/Outfit Changes
|
2020-02-02 18:07:00 +01:00 |
|
|
Ghom
|
bb1f65813e
|
Merge pull request #10858 from Citadel-Station-13/kevinz000-patch-4
Fixes APC ui_data runtime
|
2020-02-02 18:06:44 +01:00 |
|
|
Artur
|
14d749bd76
|
Weh
|
2020-02-02 16:23:26 +01:00 |
|
|
Artur
|
fe92573fc3
|
Forgot this
|
2020-02-02 13:44:44 +01:00 |
|
|
Artur
|
e7ddfdd8d8
|
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
|
2020-02-02 13:31:54 +01:00 |
|
|
kevinz000
|
66a2216ef3
|
Merge pull request #10829 from Ghommie/Ghommie-cit544
Fixed and brutalized clown op slippery weapons a little.
|
2020-02-02 03:16:23 -07:00 |
|
|
kevinz000
|
c94b5688db
|
Merge pull request #10810 from YakumoChen/ring
Adds ring jewelry
|
2020-02-02 03:16:01 -07:00 |
|
|
kevinz000
|
e0f967eaa2
|
Update apc.dm
|
2020-02-02 02:57:14 -07:00 |
|
|
kevinz000
|
3812d2d9fa
|
Merge pull request #10850 from Ghommie/Ghommie-cit548
Fixes maploaded APC terminals direction.
|
2020-02-02 02:54:53 -07:00 |
|
|
kevinz000
|
33577e0d82
|
Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
|
2020-02-02 01:47:24 -07:00 |
|
|
kevinz000
|
2cdf7fa0bb
|
Merge pull request #10784 from Seris02/polycoats
polychromic winter coats
|
2020-02-02 01:46:58 -07:00 |
|
|
kevinz000
|
aaa7733cec
|
Merge pull request #10820 from Ghommie/Ghommie-cit542
clown ops uplink consistency.
|
2020-02-02 01:39:31 -07:00 |
|
|
kevinz000
|
c9de66857e
|
Merge pull request #10833 from Ghommie/Ghommie-cit545
Playback device spam peeve.
|
2020-02-02 01:38:52 -07:00 |
|
|
kevinz000
|
38ec4f0e11
|
Update blood.dm
|
2020-02-02 01:35:38 -07:00 |
|
|
kevinz000
|
b59dd11adc
|
Update blood.dm
|
2020-02-02 01:35:16 -07:00 |
|
|
Trilbyspaceclone
|
6b2a8d49c9
|
Update science.dm
|
2020-02-02 01:39:25 -05:00 |
|
|
Seris02
|
659110ac8c
|
yee again
|
2020-02-02 13:44:45 +08:00 |
|
|
Seris02
|
4c2e702d7a
|
yee
|
2020-02-02 13:18:26 +08:00 |
|
|
Putnam
|
dd63e8cf84
|
oofies
|
2020-02-01 21:07:21 -08:00 |
|
|
Putnam
|
e812844c70
|
Revert "</span>"
This reverts commit d6d01d848c.
|
2020-02-01 21:05:27 -08:00 |
|
|
Ghommie
|
fedb05b3be
|
A PR about runtime errors
|
2020-02-02 05:43:38 +01:00 |
|
|
MrJWhit
|
d314619d0e
|
Comments out meteor defense tech node
asdf
|
2020-02-01 23:34:33 -05:00 |
|
|
Seris02
|
d3d4a9f05b
|
Update code/modules/uplink/uplink_items/uplink_roles.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-02 12:21:32 +08:00 |
|
|
Seris02
|
8053e43838
|
Update code/modules/uplink/uplink_items/uplink_roles.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-02 12:21:26 +08:00 |
|
|
Seris02
|
18489e5b65
|
merge fixes
|
2020-02-02 11:51:26 +08:00 |
|
|
Ghommie
|
cbcb9f32ba
|
Fixes maploaded APC terminals direction.
|
2020-02-02 04:21:30 +01:00 |
|
|
Ghommie
|
8de11845d5
|
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-02 03:39:49 +01:00 |
|
|
Hatterhat
|
e985d21ea3
|
fucking combifan
|
2020-02-01 20:23:01 -06:00 |
|
|
Ghommie
|
55fa48737e
|
Forgot about not versioned files.
|
2020-02-02 01:28:16 +01:00 |
|
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
|
Ghom
|
79387149a0
|
Fixes Space Ninja "Nothing" Objective.
|
2020-02-01 23:23:17 +01:00 |
|
|
Hatterhat
|
471deba88c
|
large rcd carts 5head
|
2020-02-01 13:26:43 -06:00 |
|
|
Hatterhat
|
81cf670729
|
shit whoops
|
2020-02-01 13:22:16 -06:00 |
|
|
Ghom
|
6ae5ffddb1
|
Merge pull request #10731 from necromanceranne/howdoiswitchhands
Energy crossbow changed from RNG to static effects
|
2020-02-01 18:58:03 +01:00 |
|
|
Ghom
|
d523cfd95e
|
Merge pull request #10806 from Feasel/master
[Balance Patch - Tend Wounds Edition]
|
2020-02-01 18:54:18 +01:00 |
|
|
Ghom
|
74ad10355c
|
Merge pull request #10805 from Citadel-Station-13/i-hate-dueling
guns/ammo/projectiles now properly clean up while being deleted
|
2020-02-01 18:52:47 +01:00 |
|
|
Ghom
|
3337181cac
|
Merge pull request #10352 from Seris02/smchanges
Changes to the way SM handles power related to integrity and max integrity damage
|
2020-02-01 18:46:10 +01:00 |
|
|
Ghom
|
051811ed46
|
Merge pull request #10811 from Arturlang/crafting_componitization
[READY]Ports TG updates to crafting and componentizes it
|
2020-02-01 18:36:51 +01:00 |
|
|
Ghom
|
45af9dc013
|
Merge pull request #10808 from Arturlang/macros_begone
[READY] Ports chem dispenser macro recording
|
2020-02-01 18:22:57 +01:00 |
|
|
Putnam
|
3dcce2b43a
|
added some cleanup code
|
2020-02-01 09:10:02 -08:00 |
|
|
Putnam
|
aba0379bfb
|
also need these!
|
2020-02-01 08:53:19 -08:00 |
|
|
Putnam
|
463036a4f4
|
made panic bunker save in json
|
2020-02-01 08:44:05 -08:00 |
|
|
Putnam
|
d6d01d848c
|
</span>
|
2020-02-01 06:01:54 -08:00 |
|
|
Artur
|
11fea908bd
|
Fix and rebalance a lil
|
2020-02-01 14:11:34 +01:00 |
|
|
Putnam3145
|
12f0c35660
|
Merge pull request #10803 from Seris02/highlightfix
fixes the whitespace that gets created when you have highlighting strings on
|
2020-02-01 04:15:47 -08:00 |
|
|
Putnam3145
|
17e08280b1
|
Merge pull request #10804 from Citadel-Station-13/kevinz000-patch-9
fixes a very likely race condition in dueling pistols
|
2020-02-01 04:15:32 -08:00 |
|
|
Winter Flare
|
59b5b0b9a6
|
A bunch of tiny tweaks.
Added additional blood types to blood crate.
Added Soy Sauce packet.
Added Soy Sauce and BBQ packet to chef vendor.
Changed Birthday Cake recipie to mirror TG.
|
2020-02-01 04:49:56 -05:00 |
|
|
Ghom
|
ed3ebd16a8
|
Merge pull request #10830 from Seris02/nomoreglitches
[s] fixes a glitch with the PKA
|
2020-02-01 10:06:58 +01:00 |
|
|
Putnam3145
|
33122d0d92
|
Merge branch 'master' into TGUIs_Nexties
|
2020-02-01 00:49:10 -08:00 |
|
|
Putnam
|
7e3ea27ff4
|
dumb formatting. dumb dumb.
|
2020-02-01 00:42:25 -08:00 |
|