Commit Graph

1215 Commits

Author SHA1 Message Date
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
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
Dahlular
cbdce23df4 Merge pull request #652 from ArchieBeepBoop/virofixes
[TESTMERGE] The Viro Rework done right? Ports a load of viro, (sentient) disease, symptoms code updates from tg.
2020-11-10 01:54:24 -07:00
Chemlight
3e4f99daa9 Merge remote-tracking branch 'upstream/master' into Funny-Coder-Bus 2020-11-09 23:16:19 -08:00
Chemlight
8c0f1756a1 Funny-character-bus-code
This little pull is litterally a pull for a single character I'd like to bus, basicly a walking chem dispenser, so lets go!
2020-11-09 23:03:12 -08:00
Dip
6eebc1d649 Typing Indicators 2020-11-10 01:52:06 -03:00
Dip
eee8867076 big bold 2020-11-09 20:19:29 -03:00
Dip
5a52a8ec09 extra , fuck 2020-11-09 19:54:01 -03:00
Dip
906d23f7cc More feedback for having your laws changed 2020-11-09 19:51:30 -03:00
kevinz000
a663b96d2f Merge pull request #9263 from Trilbyspaceclone/batter_up
Adds a new traitor bundle - Syndicate Major League Player
2020-11-09 18:33:18 -03:00
Dip
12f0ee88ac ahem, desc 2020-11-09 17:33:55 -03:00
Dip
c4cf92aba8 right 2020-11-09 17:33:15 -03:00
Dip
540df54984 whoops. 2020-11-09 17:30:45 -03:00
Dip
cd6483bda5 Random runtime + icon fix 2020-11-09 17:21:43 -03:00
kevinz000
f138e5cf53 Fixing Hypospray
Unmodularize MkII hyposprays and other reagent items sprites.
2020-11-09 16:45:17 -03:00
QuoteFox
48cdd74808 Ridding crop sprite.
made a  ridding crop sprite. because it was using a chain before.
2020-11-09 15:27:51 +00:00
Dip
3f5d4fe6d5 Right 2020-11-09 00:23:07 -03:00
Dip
5ab0752975 Prevents slimes from attacking other slimes + Fixes invincible runtime 2020-11-09 00:04:53 -03:00
JaySparrow
41f9ebc80a Dynamic tweaks
And a couple bugfixes.
Heart attacks only target the station z level.
Diseases now only spawn once.
2020-11-08 13:56:58 -06:00