Commit Graph

802 Commits

Author SHA1 Message Date
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
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
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
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
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
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
1ef899440b yeah also this 2020-11-04 17:12:18 -03: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
Dip
9bdbfe430f synthblood missing recipe 2020-11-03 04:55:00 -03:00
Dip
2557084af6 Paramedic Alt Title 2020-11-03 04:47:55 -03:00
Dip
2b45cd536d adv hypo design 2020-11-03 04:37:45 -03:00
kevinz000
752a3d9bcc Merge pull request #9418 from Ghommie/Ghommie-cit216
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2020-11-03 01:51:18 -03:00
kevinz000
3a84791e6c Merge pull request #9380 from Ghommie/Ghommie_cit212
refactoring and fixing altdisarm() exploits (ergo pushing people over directional windows etc).
2020-11-03 01:32:15 -03:00
Dahlular
21d973befa Merge pull request #647 from ArchieBeepBoop/herewegoagain
Ports Oracle UI framework, and updates UI for paper and disposal bins.
2020-11-02 20:56:24 -07:00
Dahlular
65abd166ce Merge pull request #646 from ArchieBeepBoop/zlevelstuff
Making the Reebe Smaller (And hopefully less laggy)
2020-11-02 20:54:49 -07:00
Dahlular
996ad3b677 Merge pull request #645 from ArchieBeepBoop/giftfix
Gift Blacklist: The Electric Sequel
2020-11-02 20:54:20 -07:00
Dahlular
60ab437ac8 Merge pull request #643 from Jay-Sparrow/Bug-fixin
Hardsuits must contain girth
2020-11-02 20:53:26 -07:00
Dip
5b96e008fe tinyfix 2020-11-02 18:38:18 -03:00
kevinz000
a86199c99f Merge pull request #9241 from Linzolle/oracleui
Ports Oracle UI framework, and updates UI for paper and disposal bins.
2020-11-02 18:14:44 -03:00
kevinz000
70f60a02ab Merge pull request #8032 from deathride58/immersivetransitturfs
Makes transit areas physically throw you out of the transit area instead of simply teleporting you
2020-11-02 17:24:51 -03:00
Dip
c4680a7c28 the sequel 2020-11-02 15:01:08 -03:00
JaySparrow
8240f5d0a7 Big bits
Cram em in
2020-11-02 04:25:02 -06:00
QuoteFox
164bff70bb Merge pull request #642 from ArchieBeepBoop/giftfix
Jacqueline and the Christmas tree no longer have the *tiny chance* to spawn narsie or a singulo or ratvar.
2020-11-02 09:33:48 +00:00
Dip
8916a47eac let's fucking NOT 2020-11-02 06:26:01 -03:00
Dahlular
af6ff73c29 Merge pull request #639 from ArchieBeepBoop/fuckcluwnes
Refactoring some of the cluwne's targeting and feedback system.
2020-11-02 00:36:03 -07:00
Dahlular
b2fb7d0d79 Merge pull request #640 from ArchieBeepBoop/revenant
Revenant Fixes & Balancing
2020-11-01 20:08:59 -07:00
Dip
2713df2455 makes revenants less shit tm 2020-11-01 22:15:41 -03:00
Dip
4e0ff0fd53 a 2020-11-01 20:33:12 -03:00
Dip
a8e8f24032 refactor 2020-11-01 20:08:54 -03:00
Dahlular
c9c2894df8 Merge pull request #631 from VladinXXV/superiormedicine
Superior medicines are actually superior now
2020-11-01 15:15:43 -07:00
Dip
6db43927c6 HAHA YEAH NO 2020-11-01 19:12:21 -03:00
Dip
c7c6b579d8 anotherone 2020-11-01 19:10:07 -03:00
Dip
ca0939c2f8 fixes the two broken autobottler designs 2020-10-30 15:06:25 -03:00
Dip
af751a7c41 Spooky meteors now only replace catastrophic 2020-10-30 15:01:02 -03:00