 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
|
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
|
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 |
|
|
Dip
|
be3dbb0ed6
|
Merge remote-tracking branch 'upstream/master' into sprayfixes
|
2020-11-10 12:15:44 -03: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 |
|
|
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
|
cd6483bda5
|
Random runtime + icon fix
|
2020-11-09 17:21:43 -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 |
|
|
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 |
|
|
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
|
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 |
|
|
DragonTrance
|
d48c2d6e89
|
Megafauna spawning change
Megafauna will no longer spawn near ruins or safe areas
|
2020-11-04 12:01:56 -07:00 |
|
|
JaySparrow
|
2abf3a7022
|
forgot one thing
meteors
|
2020-11-03 00:47:23 -06:00 |
|
|
JaySparrow
|
d64ead68ac
|
Merge branch 'master' into Dynamic2
|
2020-11-03 00:39:13 -06:00 |
|
|
JaySparrow
|
8d1ef78a58
|
buncha stuff
Hoo boy, lost power for a week, this should have been done so long ago
|
2020-11-03 00:35:55 -06: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
|
996ad3b677
|
Merge pull request #645 from ArchieBeepBoop/giftfix
Gift Blacklist: The Electric Sequel
|
2020-11-02 20:54:20 -07:00 |
|
|
Dip
|
c4680a7c28
|
the sequel
|
2020-11-02 15:01:08 -03: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
|
02b0e4c690
|
Merge pull request #641 from Jay-Sparrow/Bug-fixin
FUCK YOU LONE OP
|
2020-11-02 01:40:20 -07:00 |
|
|
JaySparrow
|
c033072884
|
FUCK YOU LONE OP
FUCK YOU FUCK YOU FUCK YOU FUCK YOU
|
2020-11-02 02:06:44 -06:00 |
|
|
Dip
|
2713df2455
|
makes revenants less shit tm
|
2020-11-01 22:15:41 -03:00 |
|
|
Ghom
|
28cdb9c5f1
|
Oh no.
|
2020-10-30 05:30:15 -03:00 |
|
|
Dahlular
|
ee0017721e
|
Merge pull request #627 from ArchieBeepBoop/spooky
The Spookening: Ports Jacqueline the Pumpqueen event + Dullahan and subsequent Fixes
|
2020-10-29 22:51:07 -06:00 |
|
|
Dip
|
9acf8ffd40
|
merge conflict drinks.dmi
|
2020-10-29 13:50:19 -03:00 |
|
|
kevinz000
|
731b38c975
|
Merge pull request #9683 from Ghommie/Ghommie-cit303
Dullahans fixes and QoL.
|
2020-10-28 16:25:19 -03:00 |
|
|
kevinz000
|
fa655a1b78
|
Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
|
2020-10-28 16:04:47 -03:00 |
|
|
kevinz000
|
82daa9b75e
|
Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3
Adds 8 more sci crates to cargo
|
2020-10-28 05:52:11 -03:00 |
|
|
kevinz000
|
45f7b020c4
|
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
|
2020-10-28 05:48:57 -03:00 |
|
|
kevinz000
|
071f1cc6af
|
Merge pull request #9198 from Trilbyspaceclone/A_Tailer's_art
Code stuffs + more framework for cargo rework cuz atomic prs are good
|
2020-10-28 04:52:13 -03:00 |
|
|
kevinz000
|
2c7c66fc89
|
Merge pull request #9589 from Ghommie/Ghommie-cit259
Porting GetComponent macros removal, and few other updates.
|
2020-10-27 14:42:55 -03:00 |
|
|
Dahlular
|
802208e969
|
Merge pull request #556 from ArchieBeepBoop/roddupe
Ladders are now Better Ladders(tm)
|
2020-10-24 23:17:44 -06:00 |
|
|
Dahlular
|
6ed7131b25
|
Merge pull request #611 from Kabramen/polisuit-fix
Fix PR #584 and some additions for lockers and kink vendor
|
2020-10-23 21:21:25 -06:00 |
|
|
Kabra_men
|
fd44d1a9fd
|
Fix PR #584 and some additions for lockers and kink vendor
|
2020-10-23 23:19:34 -03:00 |
|
|
Dip
|
5470fdd25c
|
squashing some runtimes
|
2020-10-23 21:15:06 -03:00 |
|
|
Dip
|
feaa0ecd24
|
double examine is a no no
|
2020-10-19 19:03:12 -03:00 |
|
|
Dip
|
9b7eee0a89
|
merge conflict
|
2020-10-18 16:54:22 -03:00 |
|
|
Dahlular
|
d0d9927b96
|
Merge pull request #599 from ArchieBeepBoop/becomemodular
SHITCODE: BECOME MODULAR
|
2020-10-18 13:23:38 -06:00 |
|
|
Dahlular
|
441f1cd449
|
Merge pull request #600 from Jay-Sparrow/Dynamic2
More dynamic
|
2020-10-18 13:22:15 -06:00 |
|
|
Dahlular
|
7e05bf7e62
|
Merge pull request #591 from ArchieBeepBoop/durabelt2
Turns the Durathread Belt into a general belt for all main professions in terms of allowed items
|
2020-10-18 13:18:34 -06:00 |
|