Commit Graph

12725 Commits

Author SHA1 Message Date
Seris02
49f80d52a8 bug fixes 2020-02-04 17:18:45 +08:00
Ghom
d451115bf1 Merge pull request #10854 from Seris02/meteoralertchange
Makes a proc for meteor string gen
2020-02-04 08:15:32 +01:00
Ghommie
a0caada859 runtime drifting 2020-02-04 08:05:27 +01:00
Ghom
dd4e1d8f57 Update flowers.dm 2020-02-04 06:57:07 +01:00
Ghom
4e4b0d718a Update mushrooms.dm 2020-02-04 06:52:54 +01:00
Ghom
dcb3447c12 Update misc.dm 2020-02-04 06:51:50 +01:00
Ghommie
b6509d25e6 Ports "Cleans up plante gene mutability." 2020-02-04 06:34:42 +01:00
Seris02
0e13afc10f yeet 2020-02-04 13:25:14 +08:00
Seris02
8f70bd304d yee 2020-02-04 13:24:30 +08:00
Ghom
bb3505c184 Merge pull request #10852 from MrJWhit/Comments-out-meteor-defense-tech-node
Comments out meteor defense tech node
2020-02-04 05:26:25 +01:00
Ghom
33ef9b4619 Update all_nodes.dm 2020-02-04 05:15:52 +01:00
Ghommie
0eb5aa0a2a Removing a couple troublesome NSFW unused prefs. 2020-02-04 04:58:09 +01:00
ancientpower
5aecdb6a4d initial commit 2020-02-03 20:10:39 -06:00
Ghom
b898be92f3 Update say_vr.dm 2020-02-04 02:36:46 +01:00
kevinz000
54d70cd9fe Update gun.dm 2020-02-03 18:33:24 -07:00
Ghommie
0f708cb856 pAI shenanigeans 2020-02-04 02:26:42 +01:00
Ghommie
d13d8dd953 Less hacky. 2020-02-04 02:13:11 +01:00
Ghommie
63c8612ccd Refactoring mob holders into an element. 2020-02-04 01:42:59 +01:00
ancientpower
be0695e146 bunny ear style 2020-02-03 12:05:00 -06:00
Putnam
aabd0b9e79 fixing quirk removal (whoops) 2020-02-03 08:18:49 -08:00
Putnam
e4e5b651e6 making permassassin scale with dynamic 2020-02-03 08:11:03 -08:00
Putnam
53cad493a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul 2020-02-03 03:17:23 -08:00
Putnam
82fbef9920 Made it real time, added to config 2020-02-03 03:13:19 -08:00
Ghom
76e34c7e0f Update update_icons.dm 2020-02-03 08:48:12 +01:00
Ghommie
81b5fe2de3 Further buff and fix for clown ops tearstache nade. 2020-02-03 07:08:47 +01:00
Ghommie
a365f3b499 Demodularize and nerfs mag rifles with re(?)added power cell requirements. 2020-02-03 05:16:32 +01:00
kevinz000
2393dc26eb Merge pull request #10779 from Ghommie/Ghommie-cit538
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
2020-02-02 16:31:59 -07:00
kevinz000
c24c83c1bd Merge pull request #10835 from Ghommie/Ghommie-cit546
Something about runtime errors.
2020-02-02 16:31:15 -07:00
kevinz000
341430eab5 Merge pull request #10836 from Hatterhat/rcd-carts-engifab
adding stuff to techfabs - RCD carts, combifans
2020-02-02 16:30:59 -07:00
Ghom
ff0f9b5de8 Update say_vr.dm 2020-02-02 23:24:02 +01:00
Hatterhat
ca8e40caea i mean its a stupid multiplier regardless
thanks ghom

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-02-02 14:33:45 -06:00
Hatterhat
9190b69ba3 double whoops 2020-02-02 13:40:23 -06:00
ancientpower
937f6356ab vgstation drink sliding 2020-02-02 13:26:16 -06:00
Hatterhat
5dc971f8e8 whoops 2020-02-02 13:20:43 -06:00
Ghom
6f66d76680 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
Cleanup/Partial revert of RGB blood ""rework""
2020-02-02 19:08:57 +01:00
Ghom
97be223b0b Merge pull request #10799 from Seris02/goldentoolboxfix
makes the golden ""plastitanium"" toolbox actually plastitanium
2020-02-02 19:08:16 +01:00
Ghom
96a38e6c18 Merge pull request #10837 from Owai-Seek/tinytweaks
Tweaking Chef Vendor, Blood Crate, and Cake Recipe
2020-02-02 18:07:25 +01:00
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