Commit Graph

1196 Commits

Author SHA1 Message Date
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
QuoteFox
d41fad308a Swapped the opt-in indicators. 2020-11-11 16:18:17 +00: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
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
QuoteFox
ef11319a43 Merge pull request #660 from ArchieBeepBoop/morguebeep
Morgue Coffins that have bodies with active ghosts can now alert medical.
2020-11-08 18:55:29 +00:00
QuoteFox
f8b8cf8f86 Merge pull request #659 from ArchieBeepBoop/syndicatetemp2
Attempting to Prevent megas from wandering into the syndie base, attempt #2
2020-11-08 18:53:06 +00:00
QuoteFox
e12a0117c5 Merge pull request #661 from ArchieBeepBoop/bountyyo
Adds a possible Hyper-noblium Bounty / Fixes Trash Bag of Holding Bounty
2020-11-08 18:51:51 +00:00
QuoteFox
76e3432c0f Merge pull request #662 from ArchieBeepBoop/botany
Did you know that Botany has been causing runtimes for over 12 months? Me neither. Now I do.
2020-11-08 18:49:01 +00:00
Dip
b1c2149590 Remove mapload reebe 2020-11-07 22:37:00 -03:00
Dip
a180778587 Botany Fixes 2020-11-07 13:13:46 -03:00
Dip
0eb87e4846 NT to Kinaris text changes 2020-11-07 11:09:49 -03:00
Dahlular
cce6202c50 Merge pull request #653 from Jay-Sparrow/Dynamic2
Dynamic tweaks and reworks and rebalances and oh god I've made such a terrible mess of everything oh fuck
2020-11-07 03:47:06 -07:00
Dip
124a266e9a stack size 2020-11-05 23:57:54 -03:00
Dip
dbc0d7c1a0 Large beakers to department lathes, large hypovial research 2020-11-05 16:09:38 -03:00
Dip
6e989dfa51 fixes trash bag of holding bounty 2020-11-05 04:12:08 -03:00
Dip
65476a1b54 hypernob bounty 2020-11-05 03:56:37 -03:00
Dip
38cce4ea40 a 2020-11-04 22:08:52 -03:00
Dip
7700545293 Morgue coffins can now be used by the ghosts of their bodies to alert medical for a revive. 2020-11-04 22:05:41 -03:00
Dip
1ef899440b yeah also this 2020-11-04 17:12:18 -03:00
DragonTrance
d48c2d6e89 Megafauna spawning change
Megafauna will no longer spawn near ruins or safe areas
2020-11-04 12:01:56 -07:00
Dahlular
7524cf8927 Merge pull request #651 from ArchieBeepBoop/herewego2
refactoring and fixing altdisarm() exploits (ergo pushing people over directional windows etc).
2020-11-04 02:33:36 -07:00
JaySparrow
ea5b9ca4ef Junior roles
And more! Oof ouch my soul.
2020-11-04 00:37:23 -06:00
Dip
93f79c20f6 blacklist some animals from being targeted by sentience events 2020-11-03 19:35:21 -03:00