shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,839 Commits 5 Branches 0 Tags
9361fe6d8e1ef852f7e230bbcd1da45def478b8f
Commit Graph

16070 Commits

Author SHA1 Message Date
DeltaFire
9361fe6d8e 😂 
Vitaly matrixes weren't actually succing slimes.. nice.
 2020-01-09 21:03:09 +01:00
DeltaFire15
9f8547d42d Another sync (#4) 
AAAAAAAAA
 2019-11-16 16:12:12 +01:00
DeltaFire15
0a27f2266f Merge pull request #2 from Citadel-Station-13/master 
master hardsync
 2019-11-10 18:04:53 +01:00
DeltaFire
7ab4d2f013 Viva la wehvolution 
Adding the plushies code after syncing with ros's changes
 2019-11-10 17:39:43 +01:00
DeltaFire15
6c23b0132c Merge pull request #1 from rossark/liz 
problem preventionTM
 2019-11-10 17:37:28 +01:00
DeltaFire
acdf25222a Unga time to sync this with ros's PR so no conflicts 2019-11-10 17:37:15 +01:00
DeltaFire
09aab4f40f description changes 2019-11-10 16:09:24 +01:00
BlackMajor
2c9af44ce3 Merge pull request #9724 from Ghommie/Ghommie-cit322 
Fixes free real estate paraplegic trait and bolas.
 2019-11-10 17:10:45 +13:00
DeltaFire
cf581b96b5 more lizzers! 
Adding the code for some lizzer plushies, will commit icons after rosarks PR is merged to avoid conflicts
 2019-11-08 17:34:57 +01:00
BlackMajor
aaff0bf9e7 Merge pull request #9705 from kappa-sama/patch-4 
thanks major
 2019-11-08 14:17:59 +13:00
BlackMajor
a6bbe75c36 Merge pull request #9611 from Citadel-Station-13/supply-passive-gen 
Adds passive point generation to cargo. Nerfs miasma selling. Increases mindshield crate price.
 2019-11-08 14:17:17 +13:00
rosko
cc8423ac45 adds a lizzard plushie 
yet another player plushie....this one comes with a real fake maxcap
 2019-11-05 20:38:44 +02:00
Ghommie
ae9ff92d33 Fixes free real estate paraplegic trait and bolas. 2019-11-05 18:03:50 +01:00
kappa-sama
9f04cba7bf workaround 2019-11-03 18:27:47 -05:00
kevinz000
2cdbf04272 Merge pull request #9687 from Ghommie/Ghommie-cit305 
Refactoring how Jacqueen teleportation destination is selected.
 2019-11-03 06:24:53 -07:00
kevinz000
a750721fd2 Merge pull request #9653 from Poojawa/job-ordering 
Level Order listing
 2019-11-03 06:24:08 -07:00
kevinz000
3365522bdf Merge pull request #9654 from Putnam3145/dynamic-config-2 
Adds dynamic antag injection to config
 2019-11-03 06:21:24 -07:00
kevinz000
6462d0c8c8 Merge pull request #9658 from Ghommie/Ghommie-cit291 
Fixing dogborg sleepers runtimes, how atrocious...
 2019-11-03 06:20:30 -07:00
kevinz000
5e9c1901b4 Merge pull request #9659 from Ghommie/Ghommie-cit292 
Fixing deep space gorilla runtimes, how ape...
 2019-11-03 06:20:06 -07:00
kevinz000
0fa57f6102 Merge pull request #9660 from Ghommie/Ghommie-cit293 
Fixing riding component runtimes, how drifting...
 2019-11-03 06:19:56 -07:00
kevinz000
5bfcc663f5 Merge pull request #9662 from Ghommie/Ghommie-cit294 
Fixes some average runtimes, how null...
 2019-11-03 06:19:40 -07:00
kevinz000
0615189629 Merge pull request #9665 from Ghommie/Ghommie-cit295 
Removing references to national socialism
 2019-11-03 06:18:47 -07:00
kevinz000
bd29bd1e36 Merge pull request #9668 from Putnam3145/starlight 
Gives ways for various slime-killing healing viruses not to do that.
 2019-11-03 06:18:01 -07:00
kevinz000
c484a209a7 Merge pull request #9669 from Ghommie/Ghommie-cit297 
modkit uninstall() calling forceMove() calling loc.Exited() calling modkit uninstall()
 2019-11-03 06:17:21 -07:00
kevinz000
6127593446 Merge pull request #9670 from Ghommie/Ghommie-cit298 
Mapping in arcade dirs.
 2019-11-03 06:17:02 -07:00
kevinz000
906c58d339 Merge pull request #9672 from Ghommie/Ghommie-cit299 
Obligatory changes for 513 support kevinz forgot about.
 2019-11-03 06:15:42 -07:00
kevinz000
a9cf83476f Merge pull request #9674 from Ghommie/Ghommie-300 
Updating ratvarian computer sprites.
 2019-11-03 06:15:17 -07:00
kevinz000
3a2ce8c5ce Merge pull request #9679 from Ghommie/Ghommie-cit302 
Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co
 2019-11-03 06:14:13 -07:00
kevinz000
dcee360ac5 Merge pull request #9686 from Ghommie/Ghommie-cit304 
Fixing storage implant transplant.
 2019-11-03 06:11:20 -07:00
Ghommie
2653a2965d How about we only check the living? 2019-11-02 20:46:33 +01:00
Ghommie
f4587b4260 This is very unprofessional. Yet I'm no google architect. 2019-11-02 16:47:25 +01:00
Ghommie
50fc1004ba Actually holopads, so they won't end up in maintenance... 2019-11-02 16:46:02 +01:00
Ghommie
3193e3ce20 fix. 2019-11-02 16:12:37 +01:00
Ghommie
a949f84557 missing bits. 2019-11-02 16:00:48 +01:00
Ghommie
1bf10c0435 Improving Jacqueen's teleportation area selection. 2019-11-02 15:50:54 +01:00
Ghommie
91625b6e60 item/doMove() calling dropped() callign qdel(src) because of DROPDEL. 2019-11-02 14:15:31 +01:00
Ghommie
874cdfefb8 fixing storage implant transplant. 2019-11-02 14:03:14 +01:00
Putnam
9506a78429 whoops replaced this var with a simpler check 2019-11-01 18:46:31 -07:00
kevinz000
c2aa28d775 Merge pull request #9677 from Putnam3145/clone-no-delay 
Makes clone scans lock while processing
 2019-10-31 17:27:39 -07:00
kevinz000
d9c38d0589 Merge pull request #8948 from Ghommie/Ghommie-cit156 
Cleaning up the arousal module.
 2019-10-31 17:27:03 -07:00
Putnam
64b8122548 made it go back to previous locked state instead 2019-10-31 16:46:04 -07:00
Putnam
d81d1c6b2d actually make it lock instead 2019-10-31 16:39:54 -07:00
Putnam
848c9dce00 Revert "makes cloning have no 2-second delay" 
This reverts commit 57dd768950.
 2019-10-31 16:39:02 -07:00
Ghommie
b653595702 Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co 2019-10-31 22:40:11 +01:00
Putnam
57dd768950 makes cloning have no 2-second delay 2019-10-30 23:11:50 -07:00
kevinz000
a89f490220 Merge pull request #9667 from kappa-sama/patch-3 
Gee Kevinz, why does YOUR research division let you have A HUNDRED AND SIXTY fetish gas points?
 2019-10-30 20:22:24 -07:00
Ghommie
56b65130fb Modernizing ratvarian computer sprites. 2019-10-31 01:17:21 +01:00
Ghommie
05dc64fd0a Obligatory changes for 513 kevinz forgot about. 2019-10-30 21:47:33 +01:00
Ghommie
f6feeb93ea Mapping in arcade dirs. 2019-10-30 16:47:44 +01:00
Ghommie
b86c5059d5 [s] modkit uninstall() calling forceMove() calling loc.Exited() calling modkit.uninstall() calling f... 2019-10-30 13:17:12 +01:00