Commit Graph

470 Commits

Author SHA1 Message Date
Dahlular
02b1aba9d7 Merge pull request #709 from ArchieBeepBoop/blacklistfix1
Re-Porting the Trait Blacklist System (Fixes broken respawn traits)
2020-12-01 20:14:06 -07:00
Dahlular
ec85829dca Merge pull request #725 from Oposshim/another-nanotrasen-muh-lore-tweak
Posshim's fix - of a fix - of a fix - of a fix
2020-11-30 09:49:21 -07:00
Oposshim
c8cf5e2fb7 Posshim's fix - of a fix - of a fix - of a fix
I cannot be trusted with PRs.

I missed / messed up two things from the last pull.
2020-11-30 11:30:55 -05:00
QuoteFox
8437a3e472 Merge pull request #719 from TotallyNotADog/cleanNadeFix
fixes cleaner grenades hissing whenever they come into existence
2020-11-28 09:34:12 +00:00
Dahlular
29d35a5645 Merge pull request #721 from ArchieBeepBoop/rld
Nerfs RLDs because they hard counter nightmares and night ops.
2020-11-27 13:54:58 -07:00
Dip
4d197db9ea a 2020-11-27 16:03:45 -03:00
Dip
6057e3036e change costs 2020-11-27 16:01:59 -03:00
Ghom
6502fe255f Merge pull request #10586 from Tupinambis/RLDNerf
Nerfs RLDs because they hard counter nightmares and night ops.
2020-11-27 14:44:26 -03:00
Dahlular
238ab653c4 Merge pull request #707 from Oposshim/another-nanotrasen-muh-lore-tweak
Kinaris Corp 1.1.9
2020-11-27 07:40:04 -07:00
TotallyNotADog
f9137afb8a replace glass with plastic 2020-11-25 16:01:13 -06:00
BlackMajor
3637fb2c1b Merge pull request #10082 from Citadel-Station-13/kevinz000-patch-122
Bluespace launchpad QoL (read: powercreep)
2020-11-22 06:04:23 -03:00
Dahlular
0884fc0f66 Merge pull request #704 from ArchieBeepBoop/dummyruntimes
I'M FIXING THESE RUNTIMES, WITH NO SURVIVORS.
2020-11-21 23:03:08 -07:00
Dahlular
fa5e05c44c Merge pull request #702 from ArchieBeepBoop/idbullshitpart3
Cleaning up ID Console code and other tweaks - The "I want to die" edition
2020-11-21 23:00:50 -07:00
Dahlular
f7bd548da6 Merge pull request #701 from ArchieBeepBoop/moreteleportershit
Ports "New Teleporter Station sprites." and "Add teleport station calibration animation."
2020-11-21 22:58:56 -07:00
Dahlular
6645e50dad Merge pull request #694 from ArchieBeepBoop/improvements
ATMOS Firelocks and more
2020-11-21 22:54:02 -07:00
Dahlular
7ca1b3084b Merge pull request #691 from ArchieBeepBoop/radioactivedecal
Adds a radioactive type of greenglow cleanable decal
2020-11-21 22:52:05 -07:00
Dip
2a5c61dc45 fuck me 2020-11-22 01:29:01 -03:00
Poss
40538feb24 Update camera_assembly.dm 2020-11-21 22:29:25 -05:00
Poss
27ec04f7a1 Update radio.dm 2020-11-21 22:16:32 -05:00
Poss
a514c42332 Update camera_assembly.dm 2020-11-21 22:15:47 -05:00
Poss
c77574bf10 Update cigs_lighters.dm 2020-11-21 21:58:18 -05:00
Oposshim
bb1694f301 Kinaris Corp 1.1.2
another long overdue haul of shit I forgot/was to busy to get the first patch around.
2020-11-21 12:05:56 -05:00
Dip
f2bf2235c3 ahem 2020-11-21 03:05:32 -03:00
Dip
ccd2d137b7 Fixes some dummy thicc runtimes 2020-11-21 03:03:27 -03:00
Dip
1b529c1ca1 errr 2020-11-20 21:01:24 -03:00
kevinz000
c7db7cb2be The ID Code Cleanup and Fixening (tm) 2020-11-20 20:55:27 -03:00
kevinz000
c59c9e88ae Merge pull request #9746 from Ghommie/Ghommie-cit328
Ports "Cleans up the new alt clicking functionality" from /tg/
2020-11-20 20:21:26 -03:00
kevinz000
14b3fa22ce Merge pull request #9404 from Poojawa/qm-is-a-head
QM is a head of staff, Cargo ID Console added
2020-11-20 20:12:42 -03:00
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
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
Ghom
7a8fcf77d4 ATMOS Firelocks and more 2020-11-19 11:04:04 -03:00
Dip
a2089ee778 Adds a radioactive type of greenglow cleanable decal 2020-11-17 22:53:42 -03: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
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
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
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
a76185269b Merge branch 'master' of https://github.com/ArchieBeepBoop/Hyper-Station-13 into syndicateleague2 2020-11-10 14:05:51 -03:00