Commit Graph

1306 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
0d7d215167 Merge pull request #706 from ArchieBeepBoop/speech
Speech options on char customization
2020-12-01 20:13:32 -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
5e96e1dc61 Admin help now sends to discord.
Adminhelp now sends to hyperstation discord. and some fixes to rejected, to make it sound less passive aggresive.
2020-11-30 13:59:29 +00:00
QuoteFox
6f01e83714 Merge pull request #718 from ArchieBeepBoop/wizardlizard
Allows the wizard to load their current character's appearance
2020-11-30 00:00:25 +00:00
QuoteFox
e1e8ce795d Merge pull request #723 from ArchieBeepBoop/lighteater
Fixes an inconsistency with the light eater and marker beacons
2020-11-30 00:00:01 +00:00
QuoteFox
60d39b5c03 Merge pull request #722 from ArchieBeepBoop/newfixes
2 Minor typos
2020-11-29 23:59:43 +00: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
Dip
bcd3df5bd4 Inconsistency with the light eater and marker beacons 2020-11-27 15:23:35 -03:00
Dip
7f7dd54b86 Typos 2020-11-27 15:01:34 -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
QuoteFox
27e09f2340 Merge pull request #710 from ArchieBeepBoop/38
Bluespace launchpad QoL + Mistakes
2020-11-25 04:21:32 +00:00
Dip
3ec5e4205e Allows the wizard to load their current character's appearance. 2020-11-23 19:51:43 -03:00
Dip
9d3f5fd445 These are not the same. 2020-11-22 15:10:58 -03:00
Dip
b6a8286e4f Resonance Cascade supermatter delamination event + SM beam graphics update 2020-11-22 14:47:12 -03:00
Poss
e40871a123 Update lavaland_ruin_code.dm 2020-11-22 10:24:19 -05: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
kevinz000
4c02f20812 reorganizing 2020-11-22 06:03:48 -03:00
Dip
8bde734e7a embiggen blacklist 2020-11-22 05:51:25 -03:00
Dahlular
ea1a66fd8b Merge pull request #698 from ArchieBeepBoop/hev
HEV Suit Mk.I
2020-11-22 01:36:12 -07:00
Poss
84e48e80fc Update lavaland_ruin_code.dm 2020-11-22 01:12:42 -05:00
Poss
a826bc1bd5 Update lavaland_ruin_code.dm 2020-11-22 01:08:37 -05:00
Poss
2a077a9d06 Update lavaland_ruin_code.dm 2020-11-22 01:07:03 -05:00
Dahlular
59abd14af6 Merge pull request #705 from ArchieBeepBoop/medbotfixing
Medbots are FINALLY smarter and will no longer outright kill slimes
2020-11-21 23:04:16 -07: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
f9c40981fd Merge pull request #700 from ArchieBeepBoop/shrug
Prevents dead people's cybernetic tongues from speaking for them
2020-11-21 22:58:04 -07:00
Dahlular
9d006bedde Merge pull request #697 from Jay-Sparrow/Bug-fixin
Quick fix for the antag panel
2020-11-21 22:57:39 -07:00
Dahlular
a993f671db Merge pull request #699 from ArchieBeepBoop/jelly
Fix donut sprites
2020-11-21 22:57:03 -07:00
Dahlular
32e11e05cc Merge pull request #695 from ArchieBeepBoop/ancientbug
Ancient LINDA Atmos Bug Fix
2020-11-21 22:54:48 -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
88a5ecf523 Fix2 2020-11-22 02:21:16 -03:00
Dip
2a5c61dc45 fuck me 2020-11-22 01:29:01 -03:00
Oposshim
e08120d721 Update lib_machines.dm 2020-11-21 23:04:08 -05:00
Poss
9d7e2c785e Update cigarette.dm 2020-11-21 22:47:09 -05:00
Poss
e27b3b7976 Update armory.dm 2020-11-21 22:39:07 -05:00
Poss
40538feb24 Update camera_assembly.dm 2020-11-21 22:29:25 -05:00
Poss
6d8847db0c Update security.dm 2020-11-21 22:28:43 -05:00
Poss
4108615189 Update lavaland_ruin_code.dm 2020-11-21 22:25:59 -05:00
Poss
c5a1ba73c4 Update lavaland_ruin_code.dm 2020-11-21 22:25:16 -05:00
Poss
028d439f27 Update bsa.dm 2020-11-21 22:22:57 -05:00
Poss
3f178aaa0e Update security.dm 2020-11-21 22:21:24 -05:00