TrilbySpaceClone
|
73661cfe52
|
more fixing+ chem selling tweaks
|
2019-11-13 09:39:42 -05:00 |
|
TrilbySpaceClone
|
de1ce4afc8
|
more crates and explote fixing
|
2019-11-13 09:15:44 -05:00 |
|
TrilbySpaceClone
|
ec57e28c17
|
Merge branch 'master' into Cargo_MKII
|
2019-11-13 08:00:24 -05:00 |
|
Anonymous
|
837052740a
|
Merge branch 'master' into assu
# Conflicts Resolved:
# icons/mob/head.dmi
# icons/obj/clothing/hats.dmi
|
2019-11-13 11:59:53 +03:00 |
|
kevinz000
|
4e3147b228
|
Merge pull request #9755 from Ghommie/Ghommie-cit331
lentext to length, yet another 513 requirement.
|
2019-11-12 23:59:31 -07:00 |
|
kevinz000
|
18993c735a
|
Merge pull request #9771 from Ghommie/Ghommie-cit338
Porting Robustin's Syndicate Infiltrator PR from tee-gee
|
2019-11-12 23:58:46 -07:00 |
|
kappa-sama
|
1aa1d91b61
|
Update uplink_items.dm
|
2019-11-12 17:15:45 -05:00 |
|
kappa-sama
|
f093024967
|
better guns
|
2019-11-12 17:04:36 -05:00 |
|
Ghommie
|
4ef1d64356
|
PR #47500, #47501, #47557, #47588.
|
2019-11-12 19:00:45 +01:00 |
|
Ghommie
|
c5a7c28a1b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
|
2019-11-12 16:04:05 +01:00 |
|
Ghommie
|
2b8b8882fb
|
You are actually rifght, that's bad.
|
2019-11-12 15:49:20 +01:00 |
|
Persi
|
b8137cde65
|
Reducing meteor warning time
|
2019-11-12 06:02:24 -05:00 |
|
Persi
|
c784cab060
|
Corrects the descriptions of meth and ephedrine to reflect that their movespeed buffs were previously removed.
|
2019-11-12 05:37:30 -05:00 |
|
Ghommie
|
9fb70c8af9
|
Ghommie rants, comment syntax is at stake.
|
2019-11-12 06:40:30 +01:00 |
|
Ghommie
|
176a757f62
|
Fixing suit overlays compatibility with items again.
|
2019-11-12 06:33:06 +01:00 |
|
Ghommie
|
fd33879b33
|
Fixing some reagent taste descriptions.
|
2019-11-12 06:20:33 +01:00 |
|
Ghommie
|
e3cdb55a8f
|
Makes it compile.
|
2019-11-12 04:45:47 +01:00 |
|
Ghommie
|
aad2b5bcd5
|
Fixing Aux base camera/drone RCD actions.
|
2019-11-12 04:35:10 +01:00 |
|
Ghommie
|
a18bcd05d7
|
makes it compile.
|
2019-11-12 02:38:45 +01:00 |
|
Hatterhat
|
8d2f833735
|
stamina hands
|
2019-11-11 19:14:12 -06:00 |
|
Hatterhat
|
d27150331a
|
fast hands
|
2019-11-11 18:59:31 -06:00 |
|
Ghommie
|
388a7579b9
|
A few minor clock cult improvements.
|
2019-11-12 01:49:36 +01:00 |
|
Ghommie
|
29114de3f1
|
The actual waterflower, am I funny yet?
|
2019-11-12 00:47:36 +01:00 |
|
Ghommie
|
19a511929d
|
and "Replaces the slime extract in the clown biodome with a superlube sprayer."
|
2019-11-11 23:39:03 +01:00 |
|
Ghommie
|
42d9e3cf51
|
Porting Robustin's Syndicate Infiltrator PR
|
2019-11-11 18:49:18 +01:00 |
|
Ghommie
|
63da5ffb13
|
ID console fixes and other tweaks.
|
2019-11-11 17:10:14 +01:00 |
|
TrilbySpaceClone
|
6e328ea1b1
|
art of the deal
|
2019-11-11 07:26:12 -05:00 |
|
Weblure
|
3dac695d53
|
Merge branch 'master' into Xenobio-Hotkeys
|
2019-11-10 21:55:22 -07:00 |
|
BlackMajor
|
4cd741310b
|
Borg changes and module compression
|
2019-11-11 16:35:20 +13:00 |
|
Putnam
|
2120526525
|
Merged upstream dynamic fixes ported by Ghommie.
|
2019-11-10 18:48:59 -08:00 |
|
Ghommie
|
e0afed1f8e
|
QoL dullahan ahealing.
|
2019-11-11 00:39:19 +01:00 |
|
Ghommie
|
4c1eba0d81
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226
|
2019-11-10 23:52:48 +01:00 |
|
Ghommie
|
e977ba6729
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
|
2019-11-10 23:17:58 +01:00 |
|
Ghommie
|
449f9f03c3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310
|
2019-11-10 21:20:24 +01:00 |
|
Ghommie
|
1e49ce76d3
|
Dreamchecker compatibility changes, part 1.
|
2019-11-10 20:48:30 +01:00 |
|
kevinz000
|
c4849ead74
|
Merge pull request #9727 from BlackMajor/Yeehaw
Fixes ED209 Assemblies sometimes advancing to an invalid build stage.
|
2019-11-10 11:46:03 -07:00 |
|
kevinz000
|
39e55edcb3
|
Merge pull request #9734 from Ghommie/Ghommie-cit324
Ports CEV-eris delivery packages sprites, also dunking old syndie cybernetics box sprite.
|
2019-11-10 11:45:47 -07:00 |
|
kevinz000
|
07447917de
|
Merge pull request #9744 from Seris02/meteorhallucinations
makes meteor hallucinations have an ETA now
|
2019-11-10 11:44:41 -07:00 |
|
kevinz000
|
95b98a5133
|
Merge pull request #9746 from Ghommie/Ghommie-cit328
Ports "Cleans up the new alt clicking functionality" from /tg/
|
2019-11-10 11:43:41 -07:00 |
|
kevinz000
|
48fb3a0f08
|
Merge pull request #9694 from kappa-sama/hosnowflake
Buffs security, nerfs antags
|
2019-11-10 11:40:41 -07:00 |
|
kevinz000
|
92455b5b8c
|
Merge pull request #9695 from Ghommie/Ghommie-cit311
Unmodularize and update pAI/Intellicards very slighty.
|
2019-11-10 11:40:14 -07:00 |
|
kevinz000
|
814321beeb
|
Merge pull request #9696 from Ghommie/Ghommie-cit312
clock welder overlay fix.
|
2019-11-10 11:39:54 -07:00 |
|
kevinz000
|
d1f6483687
|
Merge pull request #9704 from Ghommie/Ghommie-cit314
Minor ninja tweaks and stealth nerf.
|
2019-11-10 11:31:25 -07:00 |
|
kevinz000
|
e0626d12b1
|
Merge pull request #9707 from BonniePandora/Weldhelmets
Port Welding Hard Hats from /tg/
|
2019-11-10 11:30:54 -07:00 |
|
kevinz000
|
487e1806e7
|
Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3
Adds 8 more sci crates to cargo
|
2019-11-10 11:30:33 -07:00 |
|
kevinz000
|
7b6604108f
|
Merge pull request #9713 from Trilbyspaceclone/sprite-issues
Makes catnip have sprites
|
2019-11-10 11:28:49 -07:00 |
|
kevinz000
|
23cd6b7604
|
Merge pull request #9714 from Ghommie/Ghommie-cit315
Fixing a few throw_at calls and modular computer processors Init.
|
2019-11-10 11:28:26 -07:00 |
|
kevinz000
|
1493863533
|
Merge pull request #9716 from Ghommie/Ghommie-cit317
Porting objective code refactor (ergo fixing abductors/abductees objective by updating the code)
|
2019-11-10 11:27:04 -07:00 |
|
kevinz000
|
c46b425402
|
Merge pull request #9719 from Ghommie/Ghommie-cit318
Renames is_hot and is_sharp to get_temperature and get_sharpness, just like how ol tg did.
|
2019-11-10 11:26:06 -07:00 |
|
kevinz000
|
4fc10d436d
|
Merge pull request #9721 from Ghommie/Ghommie-cit319
Unmodularize secway and turfs
|
2019-11-10 11:25:50 -07:00 |
|