DeltaFire
|
56720ea99c
|
Merging kevinz's plush PR into mine
Adds the kara plushie, the new skylar sprite and the trillby fix into the code, all without any missing syntax elements! Yay!
|
2019-11-10 22:27:06 +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 |
|
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 |
|
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
|
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
|
0fa57f6102
|
Merge pull request #9660 from Ghommie/Ghommie-cit293
Fixing riding component runtimes, how drifting...
|
2019-11-03 06:19:56 -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
|
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
|
50fc1004ba
|
Actually holopads, so they won't end up in maintenance...
|
2019-11-02 16:46:02 +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 |
|
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 |
|
Ghommie
|
56b65130fb
|
Modernizing ratvarian computer sprites.
|
2019-10-31 01:17:21 +01:00 |
|
Ghommie
|
f6feeb93ea
|
Mapping in arcade dirs.
|
2019-10-30 16:47:44 +01:00 |
|
kevinz000
|
be752c1fb0
|
Merge pull request #9531 from Ghommie/Ghommie-cit246
Little stunbaton nerf (split off from #9500)
|
2019-10-29 21:43:45 -07:00 |
|
kevinz000
|
6dc6159f4a
|
Merge pull request #9578 from deathride58/mapsubsystemimprovements
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
|
2019-10-29 21:42:32 -07:00 |
|
kevinz000
|
fb936a5319
|
Merge pull request #9598 from deathride58/runtimefixpass
various runtime fixes - plasmaman tongues no longer have a maxHealth of "alien" and more
|
2019-10-29 21:41:11 -07:00 |
|
kevinz000
|
a7039c2d89
|
Merge pull request #9500 from Ghommie/Ghommie-cit237
teleprods works on non-carbons too now.
|
2019-10-29 21:37:41 -07:00 |
|
kevinz000
|
b172c5f691
|
Merge pull request #9501 from deathride58/stronksecborgs
Borg buffs - Allows jaws to incapacitate, gives secborg a taser, and more! (wall of text in desc)
|
2019-10-29 21:29:12 -07:00 |
|
kevinz000
|
ae4aee794e
|
Merge pull request #9592 from Ghommie/Ghommie-cit262
Porting movespeed modification system updates.
|
2019-10-29 21:27:53 -07:00 |
|
kevinz000
|
0064529362
|
Merge pull request #9610 from Ghommie/Ghommie-cit273
ports anti-magic component code updates (holymelon sold separately).
|
2019-10-29 21:26:03 -07:00 |
|
kevinz000
|
86aafd016b
|
Merge pull request #9652 from Ghommie/Ghommie-cit289
sofa sprites armrest improvements.
|
2019-10-29 21:24:07 -07:00 |
|
kevinz000
|
2ca3cedaed
|
Merge pull request #9648 from Ghommie/Ghommie-cit288
Random plush spawner tweaks and fixes.
|
2019-10-29 21:22:46 -07:00 |
|
kevinz000
|
5cb19d9973
|
Merge pull request #9646 from Ghommie/Ghommie-cit286
Fixing nuke ops / adminspawn combat mechs having tracking beacons.
|
2019-10-29 21:22:06 -07:00 |
|
kevinz000
|
0fb5687a0a
|
Update RCD.dm
|
2019-10-29 16:53:15 -07:00 |
|
kevinz000
|
0746d782d7
|
Update RCD.dm
|
2019-10-29 16:43:59 -07:00 |
|
kevinz000
|
39030b8fb0
|
Update RCD.dm
|
2019-10-29 16:37:36 -07:00 |
|
Ghommie
|
30fb851abd
|
damn
|
2019-10-30 00:09:29 +01:00 |
|
Ghommie
|
54f8c29005
|
Fixing riding component runtimes, how drifting...
|
2019-10-29 23:33:35 +01:00 |
|
Ghommie
|
6a64647ee8
|
Fixing dogborg sleepers runtimes, how atrocious...
|
2019-10-29 19:45:10 +01:00 |
|
Putnam
|
cb88fd1a44
|
added dynamic antag injection to config
|
2019-10-28 22:58:35 -07:00 |
|
Ghommie
|
85ba7943db
|
Less visual issues.
|
2019-10-29 04:58:24 +01:00 |
|
Ghommie
|
9d17e63314
|
sofa sprites armrest improvements.
|
2019-10-29 04:53:24 +01:00 |
|
Ghommie
|
f725afae64
|
Random plush spawner tweaks and fixes.
|
2019-10-29 02:06:22 +01:00 |
|
Ghommie
|
e688d37390
|
Fixing nuke ops / adminspawn combat mechs having tracking beacons.
|
2019-10-28 18:33:39 +01:00 |
|
kevinz000
|
d7e8b5209f
|
Update bags.dm
|
2019-10-27 20:36:32 -07:00 |
|
Ghommie
|
80cd4902ca
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273
|
2019-10-28 00:49:22 +01:00 |
|
kevinz000
|
48105c5a5f
|
Merge pull request #9630 from Ghommie/Ghommie-cit280
little camera console fix.
|
2019-10-27 16:11:58 -07:00 |
|
kevinz000
|
dfd06225d3
|
Merge pull request #9617 from JTGSZ/ghomfix
Barricade girder walls no longer runtime each tick.
|
2019-10-27 16:11:35 -07:00 |
|
kevinz000
|
880b4039e7
|
Merge pull request #9622 from Ghommie/Ghommie-cit275
Tweaking the Cyber Sylph's barsign.
|
2019-10-27 16:10:08 -07:00 |
|
kevinz000
|
19729ee706
|
Merge pull request #9623 from Ghommie/Ghommie-cit276
Ports "New Teleporter Station sprites." and "Add teleport station calibration animation."
|
2019-10-27 16:09:20 -07:00 |
|