Detective Google
4c10c830bf
Merge remote-tracking branch 'upstream/master' into psych+paramedic
2020-02-20 22:17:55 -06:00
Detective Google
a8f863f901
changes - sprites
2020-02-20 22:17:47 -06:00
Ghommie
4a621fb1aa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560
2020-02-14 19:39:53 +01:00
Ghom
0d37700836
Merge pull request #10926 from keronshb/PirateBombProof
...
Buffs the Pirate Ship to be bomb resistant
2020-02-10 08:40:10 +01:00
keronshb
1492586f76
Fixes round 3? 4?
...
Should fix the last round of requests?
2020-02-09 18:18:55 -05:00
keronshb
60a3b134a3
Should fix the rest of the requested changes
...
Title
2020-02-09 17:30:22 -05:00
keronshb
9609eb64e0
Fixes some files and pathings for this
...
Adds proper subtypes, put the health down a lil bit for the turret, fixed the welder type, added some tiny fans to the ship and also added some plastitanium windows where r-windows were
2020-02-09 15:18:15 -05:00
Lin
5717700146
Merge pull request #10925 from Ghommie/Ghommie-cit558
...
runtime is forever, errors are eternal.
2020-02-07 17:29:49 +00:00
Ghommie
0703c6eea6
First tweak to cargo reagents selling.
2020-02-06 22:34:54 +01:00
keronshb
5d1d652ea4
Buffs the Pirate Ship to be bomb proof
...
Title, also makes a few computers/machines indestructible and buffs turret health. It also allows turrets to be repairable now.
2020-02-05 18:28:00 -05:00
Ghommie
ab06c23a2b
runtime is forever, errors are eternal.
2020-02-05 23:48:17 +01:00
Ghommie
a0caada859
runtime drifting
2020-02-04 08:05:27 +01:00
kevinz000
c24c83c1bd
Merge pull request #10835 from Ghommie/Ghommie-cit546
...
Something about runtime errors.
2020-02-02 16:31:15 -07: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
kevinz000
33577e0d82
Merge pull request #10813 from Ghommie/Ghommie-cit540
...
Unicode support updates from tgstation.
2020-02-02 01:47:24 -07:00
Ghommie
8923810de2
Something about runtime errors.
2020-02-01 07:19:49 +01:00
Ghom
3519fbc909
F
2020-02-01 02:16:52 +01:00
Ghommie
ab4aa29576
clown ops infiltrator consistency.
2020-02-01 00:02:31 +01:00
Ghommie
188f726ffd
unicode support port wip
2020-01-31 05:32:00 +01:00
kevinz000
b4ee518945
Merge pull request #10725 from Putnam3145/fix-rotation
...
made engine rotation properly blacklist 0-weighted ones
2020-01-26 14:04:31 -07:00
Putnam
52e473ba07
argh
2020-01-25 19:42:36 -08:00
kevinz000
603ab65ed1
Merge pull request #10151 from Ghommie/Ghommie-cit450
...
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
2020-01-25 19:33:26 -07:00
kevinz000
5e96ffb5a0
compile
2020-01-24 23:18:44 -07:00
kevinz000
ad0c5d7d04
(probably) FIXES INFINITE STREAKING
2020-01-24 23:00:30 -07:00
kevinz000
b9274c63d0
define usage
2020-01-24 22:50:28 -07:00
kevinz000
8a5246c5d6
Reverts gibs being bloody. At all. It already makes splatters stop making blood.
2020-01-24 22:45:23 -07:00
kevinz000
87e7d8ead0
revert cleanable/blood amount per decal oh yeah this is why cults get all that EXTRA BLOOD.
2020-01-24 22:44:40 -07:00
Ghommie
721fd108f9
A few more, ported, runtime fixes.
2020-01-24 03:02:07 +01:00
Ghom
047059617c
Merge pull request #10645 from r4d6/Modular-Lavaland
...
Modularize the mining base
2020-01-23 02:53:34 +01:00
r4d6
e3cb379bde
Add the Mining Base as a submap
2020-01-21 20:31:40 -05:00
kevinz000
8f60d01208
Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8
2020-01-20 22:47:21 -07:00
Ghommie
5644617786
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450
2020-01-20 20:59:38 +01:00
Ghommie
9c0b78bc09
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-18 01:23:08 +01:00
kappa-sama
3e199ed780
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer
2020-01-12 14:23:38 -05:00
Ghommie
c14439494a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
kevinz000
60524fb9c7
Merge pull request #10416 from r4d6/RCD-Updates
...
Massive RCD Port & Updates
2020-01-12 00:45:21 -08:00
Seris02
29b66db9e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport
2020-01-11 11:29:30 +08:00
Seris02
0b0b80f174
explosions
2020-01-11 11:22:59 +08:00
kappa-sama
25422542c9
this
2020-01-10 22:19:00 -05:00
Ghommie
825b4f01c2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-10 02:26:19 +01:00
r4d6
f6fef84984
Make the RCD effect not right-clickable.
2020-01-07 11:23:25 -05:00
Putnam
f728c4746f
Allowed random engines to be weighted.
2020-01-06 16:25:17 -08:00
kevinz000
07885a399a
Update muzzle.dm
2020-01-05 15:04:13 -08:00
kevinz000
6e1e1aac3e
Update impact.dm
2020-01-05 15:03:42 -08:00
kevinz000
eea8d353b6
Update tracer.dm
2020-01-05 15:03:14 -08:00
Ghommie
686a76dd1d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-04 13:35:05 +01:00
Ghommie
f5b251db66
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-03 18:24:39 +01:00
r4d6
7347cb0ba6
Merge branch 'master' into RCD-Updates
2020-01-03 03:09:11 -05:00
r4d6
37d50e2aaf
Add RCD effects
...
Port : https://github.com/tgstation/tgstation/pull/47894 & https://github.com/tgstation/tgstation/pull/48362/files
2020-01-03 02:13:20 -05:00
