Commit Graph

1232 Commits

Author SHA1 Message Date
kevinz000
6eebba4b2e Merge pull request #9623 from Ghommie/Ghommie-cit276
Ports "New Teleporter Station sprites." and "Add teleport station calibration animation."
2020-11-20 19:58:42 -03:00
Dahlular
7b1991a42a Merge pull request #689 from ArchieBeepBoop/darts
Tweaks smartdarts with a few quality of life functions, and add a few new things.
2020-11-19 23:23:17 -07:00
Dahlular
04e21a02ab Merge pull request #688 from Chemlight/Ashwalkers-lets-not
Ashwalkers to station for no raisen
2020-11-19 23:22:33 -07:00
Dahlular
2e58f6ebb7 Merge pull request #687 from ArchieBeepBoop/mutation
Fixes mutations runtiming left and right / owner not being set in mutation
2020-11-19 23:22:12 -07:00
Dahlular
fe3d601c7c Merge pull request #685 from ArchieBeepBoop/nearsighted
Fixes Nearsighted overriding all glasses on spawn
2020-11-19 23:20:08 -07:00
Dahlular
ed8ace7576 Merge pull request #684 from DragonTrance/kudzu-fix
Kudzu/Spacevine fix
2020-11-19 23:19:19 -07:00
Dahlular
79d678fe19 Merge pull request #678 from ArchieBeepBoop/teleportfixes
[Testmerge] Mass fixing Teleporter issues + Implant Location Refactoring and Fixes
2020-11-19 23:18:37 -07:00
kevinz000
5eb8b535c3 Merge pull request #9505 from Thalpy/Smartdart-QoL
[READY] Tweaks smartdarts with a few quality of life functions, and add a few new things.
2020-11-17 00:31:16 -03:00
Chemlight
cd6b62dd76 Ashwalkers to station for no raisen
Simply makes it that the ghost role flavor text spawn tells them that it's simply not okay to just run up onto station as an ashwalker. Fight on home turf!
2020-11-16 18:37:48 -08:00
Dip
b8183fafa6 improper clamp? 2020-11-15 19:34:22 -03:00
kevinz000
96a09b1793 Merge pull request #11578 from Ghommie/Ghommie-cit636
Fixing owner not being set in mutation/on_aquiring.
2020-11-15 19:19:44 -03:00
Dip
85ff244305 fix nearsighted overriding all glasses 2020-11-14 23:10:44 -03:00
DragonTrance
1404fe22b2 kudzu vines fix
Makes kudzu follow the laws of production speed, 1 being the fastest
2020-11-14 19:02:21 -07:00
Dahlular
9b276b797b Merge pull request #683 from Jay-Sparrow/Dynamic2
Anonymous voting
2020-11-14 18:25:17 -07:00
Dahlular
4352631152 Merge pull request #682 from Jay-Sparrow/Head-restrtict
Stop AI from being handed traitor objectives
2020-11-14 18:24:19 -07:00
JaySparrow
1d4f134104 Anonymous voting
Shhhhhhhhhhh
2020-11-14 17:27:37 -06:00
Dahlular
5dc5baa42d Merge pull request #681 from Jay-Sparrow/master
Medical Doctor also has time requirements
2020-11-13 19:18:32 -07:00
Dahlular
28096ff19b Merge pull request #680 from ArchieBeepBoop/lunar
Lunar Items v0.1
2020-11-13 19:15:12 -07:00
Dahlular
a651063393 Merge pull request #679 from Chemlight/Funny-Coder-Bus
Hotfix bus
2020-11-13 19:10:48 -07:00
Dahlular
a0d3ab8707 Merge pull request #677 from ArchieBeepBoop/supermatterfixes
Makes the SM A little less vulnerable to tesla delams. Also, ability to light up a cig on the SM.
2020-11-13 19:09:57 -07:00
Dahlular
a6da8a4373 Merge pull request #676 from ArchieBeepBoop/radiationresonance
[Proposal] Makes radiation resonance less undesirable.
2020-11-13 19:09:10 -07:00
Dahlular
ac97ca4d42 Merge pull request #674 from ArchieBeepBoop/gar
Pierce the heavens with POLYCHROMIC Gar Glasses
2020-11-13 19:07:05 -07:00
Dahlular
a731cd1e8e Merge pull request #673 from ArchieBeepBoop/paraplegic
Fixes Paraplegic Free Real Estate
2020-11-13 19:03:01 -07:00
Dahlular
9f81844816 Merge pull request #669 from ArchieBeepBoop/syndicateleague2
The Syndicate Major League has arrived
2020-11-13 18:58:28 -07:00
Dahlular
b4eac5e28a Merge pull request #658 from DragonTrance/master
Megafauna spawn within safe regions
2020-11-13 18:56:27 -07:00
JaySparrow
955da8662b AI wants to be a thief tator
But he ain't got no hands
2020-11-13 16:58:07 -06:00
Dip
78b97a1d51 lunar altar (temporary) 2020-11-13 19:29:03 -03:00
JaySparrow
76f4821aa4 Missed one
Doctor's need EXP requirements now.
2020-11-13 16:03:16 -06:00
Chemlight
6a0f2d5602 Hotfix bus
Simply fixing code and further testing for a potential prototype, don't know where I'm going to this.
2020-11-12 04:48:27 -08:00
kevinz000
5f0ecb205b Merge pull request #9686 from Ghommie/Ghommie-cit304
Fixing storage implant transplant.
2020-11-12 04:00:11 -03:00
kevinz000
ff8257bc73 Merge pull request #9547 from Ghommie/Ghommie-cit250
Fixes silicons being unable to use the teleporter and records consoles from a distance
2020-11-12 03:59:32 -03:00
kevinz000
f85a275834 Merge pull request #9510 from Ghommie/Ghommie-cit240
Fixing tracking implant teleport issues.
2020-11-12 03:58:15 -03:00
kevinz000
4bd370532d Merge pull request #8401 from Ghommie/Ghommie-cit11
Refactoring Implants' loc n°3
2020-11-12 03:53:27 -03:00
Dip
ad264c341c Makes the SM A little less vulnerable to tesla delams, etc 2020-11-12 03:30:09 -03:00
Dip
2b6448cab4 Makes radiation resonance less undesirable. 2020-11-12 02:29:42 -03:00
QuoteFox
d41fad308a Swapped the opt-in indicators. 2020-11-11 16:18:17 +00:00
Dip
66a0b66479 Medical Gar 2020-11-11 05:21:44 -03:00
Dip
99d5f2f43b Fuck monochrome, polychrome is now the deal 2020-11-10 20:50:28 -03:00
Dip
50e6e6542e desc 2020-11-10 18:18:55 -03:00
Dip
3fe84d7fa6 yeah no I'm fixing floating in another pr, fuck this 2020-11-10 18:03:02 -03:00
BlackMajor
8d914d0b21 Number one 2020-11-10 17:51:07 -03:00
Dip
49e4ae5766 row row fight the power 2020-11-10 17:15:24 -03:00
Dip
a76185269b Merge branch 'master' of https://github.com/ArchieBeepBoop/Hyper-Station-13 into syndicateleague2 2020-11-10 14:05:51 -03:00
QuoteFox
73285fda5d Merge pull request #666 from Jay-Sparrow/Dynamic2
Dynamic tweaks - and bugfixes
2020-11-10 17:00:24 +00:00
QuoteFox
7b88262fdc Merge pull request #668 from ArchieBeepBoop/sprayfixes
Unmodularize Hypospray and certain reagents, fix runtimes
2020-11-10 17:00:05 +00:00
QuoteFox
25ed29555c Merge pull request #670 from ArchieBeepBoop/ailaws
More feedback for having your laws changed
2020-11-10 16:59:37 +00:00
QuoteFox
1b3d33388a Merge pull request #671 from ArchieBeepBoop/indicators
Typing Indicators
2020-11-10 16:58:24 +00:00
Dip
be3dbb0ed6 Merge remote-tracking branch 'upstream/master' into sprayfixes 2020-11-10 12:15:44 -03:00
Dahlular
12ee6aaf27 Merge pull request #672 from Chemlight/Funny-Coder-Bus
Funny-character-bus-code
2020-11-10 03:10:29 -07:00
Dahlular
b25faa3d24 Merge pull request #656 from Jay-Sparrow/Head-restrtict
Junior roles
2020-11-10 01:56:36 -07:00