Commit Graph
1992 Commits
Author SHA1 Message Date
Dip 78b97a1d51 lunar altar (temporary) 2020-11-13 19:29:03 -03:00
Dip 1b2b42f8a6 a 2020-11-13 19:16:31 -03:00
Dip 579211f214 Lunar Items v0.1 2020-11-13 19:08:07 -03:00
QuoteFox d41fad308a Swapped the opt-in indicators. 2020-11-11 16:18:17 +00:00
QuoteFoxandGitHub 73285fda5d Merge pull request #666 from Jay-Sparrow/Dynamic2
Dynamic tweaks - and bugfixes
2020-11-10 17:00:24 +00:00
QuoteFoxandGitHub 7b88262fdc Merge pull request #668 from ArchieBeepBoop/sprayfixes
Unmodularize Hypospray and certain reagents, fix runtimes
2020-11-10 17:00:05 +00:00
QuoteFoxandGitHub 25ed29555c Merge pull request #670 from ArchieBeepBoop/ailaws
More feedback for having your laws changed
2020-11-10 16:59:37 +00:00
QuoteFoxandGitHub 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
Dip 42d33e2b78 Merge branch 'master' of https://github.com/ArchieBeepBoop/Hyper-Station-13 into sprayfixes 2020-11-10 11:51:19 -03:00
DahlularandGitHub 12ee6aaf27 Merge pull request #672 from Chemlight/Funny-Coder-Bus
Funny-character-bus-code
2020-11-10 03:10:29 -07:00
DahlularandGitHub b25faa3d24 Merge pull request #656 from Jay-Sparrow/Head-restrtict
Junior roles
2020-11-10 01:56:36 -07:00
DahlularandGitHub aa99ed85ed Merge pull request #650 from quotefox/dependabot/npm_and_yarn/tgui/bl-1.2.3
Bump bl from 1.2.2 to 1.2.3 in /tgui
2020-11-10 01:55:16 -07:00
DahlularandGitHub 4d2d6ebea0 Merge pull request #649 from quotefox/dependabot/pip/tools/mapmerge2/pillow-7.1.0
Bump pillow from 5.1.0 to 7.1.0 in /tools/mapmerge2
2020-11-10 01:54:52 -07:00
DahlularandGitHub 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
QuoteFox 8ee1836b40 fix penis sprite
fix penis sprite
2020-11-10 03:13:05 +00: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
QuoteFox e56b7226c5 Revert "new size"
This reverts commit 640786d203.
2020-11-09 21:29:00 +00:00
QuoteFox 640786d203 new size
new size
2020-11-09 21:21:44 +00:00
QuoteFox 10061594d8 comment out on comd.dm
comment out on comd.dm (confusing how to use condoms with extra features.)
2020-11-09 21:03:39 +00:00
QuoteFox 1e3b069017 New erect penis sprites.
New erect penis sprites.
2020-11-09 20:45:29 +00: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
kevinz000andDip f138e5cf53 Fixing Hypospray
Unmodularize MkII hyposprays and other reagent items sprites.
2020-11-09 16:45:17 -03:00
Dip cde46675f3 Fix examine 2020-11-09 16:15:14 -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
DahlularandGitHub bbb168acfc Merge pull request #667 from ArchieBeepBoop/morebugs
Fixes Infinite Slime Exploit + Fixes invincible runtime
2020-11-08 20:37:19 -07: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
QuoteFoxandGitHub 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
QuoteFoxandGitHub 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
QuoteFoxandGitHub 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
QuoteFoxandGitHub 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
DahlularandGitHub 294df44b3d Merge pull request #665 from ArchieBeepBoop/ratvar
Revert Reebe on mapload
2020-11-07 18:44:24 -07:00
Dip b1c2149590 Remove mapload reebe 2020-11-07 22:37:00 -03:00
Dip d9ed242ae5 Merge remote-tracking branch 'upstream/master' 2020-11-07 22:09:42 -03:00
Dip a180778587 Botany Fixes 2020-11-07 13:13:46 -03:00
Dip b7f296aaa3 Typo 2020-11-07 11:11:03 -03:00
Dip 0eb87e4846 NT to Kinaris text changes 2020-11-07 11:09:49 -03:00
DahlularandGitHub 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