 DahlularandGitHub
|
a651063393
|
Merge pull request #679 from Chemlight/Funny-Coder-Bus
Hotfix bus
|
2020-11-13 19:10:48 -07:00 |
|
|
DahlularandGitHub
|
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 |
|
|
DahlularandGitHub
|
a6da8a4373
|
Merge pull request #676 from ArchieBeepBoop/radiationresonance
[Proposal] Makes radiation resonance less undesirable.
|
2020-11-13 19:09:10 -07:00 |
|
|
DahlularandGitHub
|
ac97ca4d42
|
Merge pull request #674 from ArchieBeepBoop/gar
Pierce the heavens with POLYCHROMIC Gar Glasses
|
2020-11-13 19:07:05 -07:00 |
|
|
DahlularandGitHub
|
a731cd1e8e
|
Merge pull request #673 from ArchieBeepBoop/paraplegic
Fixes Paraplegic Free Real Estate
|
2020-11-13 19:03:01 -07:00 |
|
|
DahlularandGitHub
|
9f81844816
|
Merge pull request #669 from ArchieBeepBoop/syndicateleague2
The Syndicate Major League has arrived
|
2020-11-13 18:58:28 -07:00 |
|
|
DahlularandGitHub
|
b4eac5e28a
|
Merge pull request #658 from DragonTrance/master
Megafauna spawn within safe regions
|
2020-11-13 18:56:27 -07: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 |
|
|
BlackMajorandDip
|
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 |
|
|
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 |
|
|
kevinz000andDip
|
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 |
|
|
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 |
|