Ghom
|
181944bb36
|
Update admin_ranks.dm
|
2020-02-06 03:07:42 +01:00 |
|
Ghom
|
6d78d01612
|
Merge pull request #10903 from Hatterhat/tg-47770
fuck organ decay - tgstation#47770
|
2020-02-05 19:26:40 +01:00 |
|
Ghom
|
7e8bc10b8e
|
Merge pull request #10894 from Trilbyspaceclone/carps
Buffs carps again
|
2020-02-05 18:32:18 +01:00 |
|
kevinz000
|
f05d37b7fd
|
Merge pull request #10855 from Trilbyspaceclone/patch-274
The Syndicats are run by aliens - Fixes Alien cargo crate to be correction emag
|
2020-02-05 01:10:21 -07:00 |
|
Ghom
|
02d1761c0a
|
Merge pull request #10747 from Citadel-Station-13/kevinz000-patch-11
shoving someone into a wall on the second shove now also disarms their weapon
|
2020-02-05 07:38:14 +01:00 |
|
Ghom
|
4cdade4b2d
|
Merge pull request #10788 from Seris02/crushboots
crushing magboots for tators
|
2020-02-05 07:36:14 +01:00 |
|
Ghom
|
402283e86a
|
Merge pull request #10791 from Arturlang/more_bloodsucker_tweaks
[READY] Further tweaks to bloodsuckers
|
2020-02-05 07:23:36 +01:00 |
|
Ghom
|
4b1e3d216f
|
Merge pull request #10583 from Putnam3145/arousal-tweaks
Consent logging
|
2020-02-05 07:19:37 +01:00 |
|
Ghom
|
68cbc3487a
|
Update species.dm
|
2020-02-05 07:09:55 +01:00 |
|
Trilbyspaceclone
|
1547f99ddb
|
Update carp.dm
|
2020-02-05 00:59:16 -05:00 |
|
Ghom
|
aaa45f102e
|
Merge pull request #10875 from ancientpower/m-bunny-ears
Adds bunny ear style for humans and anthromorphs
|
2020-02-05 06:50:10 +01:00 |
|
Ghom
|
57ac5c3d66
|
Update carp.dm
|
2020-02-05 06:12:57 +01:00 |
|
Trilbyspaceclone
|
4ecbd1e407
|
Update carp.dm
|
2020-02-04 22:00:33 -05:00 |
|
Trilbyspaceclone
|
fb2498781c
|
Update carp.dm
|
2020-02-04 20:29:50 -05:00 |
|
Ghom
|
b4ba381b59
|
Merge pull request #10739 from r4d6/Dwarven_Language
Add a Dwarf Language
|
2020-02-05 02:03:42 +01:00 |
|
Hatterhat
|
fe717597da
|
fuck fermichem
|
2020-02-04 18:35:26 -06:00 |
|
Ghom
|
642a8c4217
|
Merge pull request #10893 from Arturlang/TGUI_Next_Crafting
[READY]TGUI Next Crafting
|
2020-02-05 00:04:21 +01:00 |
|
Ghom
|
c24ffa8f1c
|
Merge pull request #10840 from Putnam3145/easier_bunker
Save panic bunker between rounds
|
2020-02-04 21:15:37 +01:00 |
|
Trilbyspaceclone
|
8458340541
|
Update science.dm
|
2020-02-04 14:38:24 -05:00 |
|
TrilbySpaceClone
|
f66d401516
|
forgot to move the var
|
2020-02-04 07:16:15 -05:00 |
|
Artur
|
614a44ea18
|
Merge remote-tracking branch 'upstream/master' into TGUI_Next_Crafting
|
2020-02-04 13:11:02 +01:00 |
|
TrilbySpaceClone
|
4842e29c2e
|
buffs carps again
|
2020-02-04 07:09:50 -05:00 |
|
Trilbyspaceclone
|
e237fefbf4
|
Update science.dm
|
2020-02-04 06:45:37 -05:00 |
|
Artur
|
0391513220
|
Works now
|
2020-02-04 12:05:15 +01:00 |
|
kevinz000
|
13df3dbb05
|
Merge pull request #10867 from Ghommie/Ghommie-cit551
Further buff and fix to the clown ops' tearstache grenade.
|
2020-02-04 03:55:22 -07:00 |
|
kevinz000
|
aa129b9539
|
Update species.dm
|
2020-02-04 03:46:13 -07:00 |
|
kevinz000
|
275b1f73e0
|
Merge pull request #10849 from Ghommie/Ghommie-cit547
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-04 03:39:14 -07:00 |
|
kevinz000
|
66fc2e77f0
|
Merge pull request #10865 from Ghommie/Ghommie-cit550
Demodularizes and nerfs magnetic rifles/pistols with power cell requirements.
|
2020-02-04 03:35:33 -07:00 |
|
kevinz000
|
be09322f8e
|
Merge pull request #10882 from Citadel-Station-13/Ghommie-patch-8
Fixes "2048" subtle emotes.
|
2020-02-04 03:34:52 -07:00 |
|
kevinz000
|
ab696ac50a
|
Merge pull request #10847 from Citadel-Station-13/Ghommie-patch-2
Fixes Space Ninja "Nothing" Objective.
|
2020-02-04 03:33:55 -07:00 |
|
kevinz000
|
b34d6cba0c
|
Merge pull request #10864 from Citadel-Station-13/Ghommie-patch-1
Hello subtler roleplayers, I see you.
|
2020-02-04 03:33:14 -07:00 |
|
kevinz000
|
d5a44097a3
|
Merge pull request #10862 from Hatterhat/boy-i-fucked-up-that-examine
seed extractor examine tweak/fix
|
2020-02-04 03:32:57 -07:00 |
|
Artur
|
0452286468
|
Fixes no thrall bloodcost
|
2020-02-04 11:21:47 +01:00 |
|
kevinz000
|
97583bd98f
|
Merge pull request #10853 from Ghommie/Ghommie-cit549
A PR about runtime errors
|
2020-02-04 03:20:34 -07: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 |
|
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 |
|
Ghom
|
b898be92f3
|
Update say_vr.dm
|
2020-02-04 02:36:46 +01:00 |
|
ancientpower
|
be0695e146
|
bunny ear style
|
2020-02-03 12:05:00 -06:00 |
|
Putnam
|
82fbef9920
|
Made it real time, added to config
|
2020-02-03 03:13:19 -08: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 |
|