Ghom
|
e92183e968
|
Merge pull request #10541 from Detective-Google/the-p-o-o-l
adds the POOL to box station
|
2020-02-21 02:43:04 +01:00 |
|
Ghom
|
0f8f6e417b
|
Merge branch 'master' into Ghommie-cit528
|
2020-02-21 02:40:22 +01:00 |
|
Ghom
|
503214dee6
|
Update freezer.dm
|
2020-02-21 02:26:52 +01:00 |
|
Ghom
|
d38c2bc6c0
|
Update twohanded.dm
|
2020-02-21 02:20:38 +01:00 |
|
keronshb
|
7a1bc9d22b
|
Fixes the travis issues
Fixes the travis issues, Exo still remains a mystery
|
2020-02-20 19:11:04 -05:00 |
|
Putnam
|
a49260e0ac
|
Revert "maybe this'll work."
This reverts commit 8d00f11fc1.
|
2020-02-20 16:03:00 -08:00 |
|
Putnam
|
8d00f11fc1
|
maybe this'll work.
|
2020-02-20 16:01:06 -08:00 |
|
keronshb
|
4ca9eb4171
|
Fixes healing nanites
Fixes Accelerated Regeneration, Bio Regen, and Mechanical.
Also changed one line on Exo nanites but it doesn't fix those. Dunno what to do.
|
2020-02-20 18:11:54 -05:00 |
|
Lin
|
9999e15db9
|
Merge pull request #11155 from necromanceranne/cham_project_exploities
Cham projector no longer lets you become literally unclickable
|
2020-02-20 16:50:07 -06:00 |
|
Ghom
|
613158fe4e
|
Merge pull request #11157 from Putnam3145/lick-pref
Lick pref
|
2020-02-20 20:53:27 +01:00 |
|
Ghom
|
4649183a47
|
Merge pull request #11154 from Kraseo/fuck-nightmares
Fixes nightmares deleting guns with flashlights
|
2020-02-20 20:52:29 +01:00 |
|
Ghom
|
7763475b83
|
Merge pull request #10572 from Tupinambis/SiliconDefault
Removes harm prevention clause indicators from relevant sources.
|
2020-02-20 15:33:27 +01:00 |
|
Ghom
|
6347dab0a3
|
Merge pull request #11142 from kevinz000/vampire_haste
makes vampire haste more reliable and slightly less of an example of how not to code
|
2020-02-20 15:31:39 +01:00 |
|
Ghom
|
608bb0a04c
|
Merge pull request #10649 from kevinz000/hijack
Completely reworks the hijack objective, and shuttle hijacking in general
|
2020-02-20 14:40:08 +01:00 |
|
kevinz000
|
ca777c6c8b
|
Merge pull request #11153 from Ghommie/Ghommie-cit587
Fixing addiction moodlets not going away and secret sauce recipe paper.
|
2020-02-20 06:17:33 -07:00 |
|
BlackMajor
|
cf0b1bbac6
|
Replace ablative bat with spear. Give ruins a max distance from the transit edge, to dissuade spawning too close to the station.
|
2020-02-21 00:22:50 +13:00 |
|
Artur
|
5d76d33683
|
Merge remote-tracking branch 'Upstream/master' into Solar_updates
|
2020-02-20 13:15:46 +02:00 |
|
Artur
|
35aecac620
|
Disgust mood for bloodsuckers being disgusted, and blood bag inneficency
|
2020-02-20 12:50:25 +02:00 |
|
Ghom
|
26bbc64f16
|
Merge pull request #11136 from Owai-Seek/broomport-2-17-19
Ports Broom, Tweak Janitor Vendor
|
2020-02-20 11:48:06 +01:00 |
|
Ghom
|
d680ab9fd5
|
Merge pull request #11025 from Arturlang/TGUI_Next_Nanites
Ports TGUI Next and a lot of misc updates for nanites.
|
2020-02-20 11:27:48 +01:00 |
|
Ghom
|
32c001f264
|
Merge pull request #11140 from Citadel-Station-13/kevinz000-patch-15
buffs pai radio short 5 -> 3 minutes
|
2020-02-20 11:26:17 +01:00 |
|
Ghom
|
89f256866d
|
Merge pull request #11033 from kevinz000/cmo_drapes
gives CMO special surgery drapes that can initiate techweb surgeries without operating console
|
2020-02-20 11:24:50 +01:00 |
|
Ghom
|
8c7e760f18
|
Merge pull request #11166 from Putnam3145/why-what
Fixing IRV
|
2020-02-20 11:14:15 +01:00 |
|
Ghom
|
f94f997cc2
|
Merge pull request #11080 from kevinz000/surubatons
hey someone gave me this idea for stunbatons (and I sort of expanded it) and it's worth a test
|
2020-02-20 11:09:46 +01:00 |
|
Ghom
|
7d8ae07fa0
|
Merge pull request #11139 from Citadel-Station-13/kevinz000-patch-12
projectiles now pierce through pAIs no matter what
|
2020-02-20 11:09:03 +01:00 |
|
Ghom
|
c1f8deb4a5
|
Merge pull request #11141 from Citadel-Station-13/kevinz000-patch-17
removes pai fulltile opacity
|
2020-02-20 11:08:27 +01:00 |
|
Ghom
|
e9d0f536de
|
Merge pull request #11146 from Putnam3145/supermatter-hardcap
Hardcaps supermatter damage from ballistics and similar
|
2020-02-20 11:08:14 +01:00 |
|
Ghom
|
1f42e9f451
|
Merge pull request #11149 from Putnam3145/fix-vendor-badcode
fixes mining vendors failing and eating your points iff you have exactly enough points
|
2020-02-20 11:07:51 +01:00 |
|
Ghom
|
22a041f72b
|
Merge pull request #11160 from Hatterhat/chem-combat-sucked-anyway
a mouth cover check for pies
|
2020-02-20 11:00:00 +01:00 |
|
TrilbySpaceClone
|
5401796a5f
|
corrections
|
2020-02-20 02:40:34 -05:00 |
|
Persi
|
c4b4a90bd8
|
Oh hey it's KiloStation
Trying to make Kilo open...
Finally, the work begins!
Kilo added!
Kilo Station!
|
2020-02-20 00:58:54 -05:00 |
|
Putnam
|
71c71766e6
|
one of those runtimes that will never show up in play but boy howdy
|
2020-02-19 21:53:22 -08:00 |
|
kevinz000
|
d7403b3436
|
john doe
|
2020-02-19 22:26:10 -07:00 |
|
kevinz000
|
2dd5a0cfb8
|
Merge branch 'master' into hijack
|
2020-02-19 22:25:31 -07:00 |
|
kevinz000
|
fd410963a9
|
Update teleportation.dm
|
2020-02-19 22:23:54 -07:00 |
|
kevinz000
|
4373f116e0
|
Update teleportation.dm
|
2020-02-19 22:07:03 -07:00 |
|
Putnam
|
00618dbc9b
|
whoops option is a number
|
2020-02-19 20:58:06 -08:00 |
|
raspyosu
|
00f21ed685
|
revert mesmerize spammability
used to not begin cooldown upon windup fail, now does
|
2020-02-19 23:37:11 -05:00 |
|
Hatterhat
|
362ebbcf8f
|
shit
|
2020-02-19 21:14:13 -06:00 |
|
Hatterhat
|
b5e369aaf1
|
i forgot about that one
|
2020-02-19 21:00:31 -06:00 |
|
Hatterhat
|
2d32c47743
|
so i forgot to change that over
|
2020-02-19 20:59:02 -06:00 |
|
kevinz000
|
a06fcea985
|
Merge remote-tracking branch 'citadel/master' into vampire_haste
|
2020-02-19 19:16:58 -07:00 |
|
kevinz000
|
c7273c03be
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-19 19:12:27 -07:00 |
|
kevinz000
|
8610c7f664
|
better inhands
|
2020-02-19 19:10:19 -07:00 |
|
kevinz000
|
6f31e1270e
|
Merge pull request #11098 from Trilbyspaceclone/bows!
Silk into clothing, bows, arrows, quivers and more!
|
2020-02-19 19:05:49 -07:00 |
|
kevinz000
|
49279086b7
|
Merge pull request #11113 from CameronWoof/biogeneratin'
Adds diethylamine and saltpetre to the biogenerator
|
2020-02-19 19:03:35 -07:00 |
|
kevinz000
|
9589c3116b
|
Merge pull request #11115 from Ghommie/Ghommie-cit583
Something more about runtime errors.
|
2020-02-19 19:03:01 -07:00 |
|
kevinz000
|
a10c71320d
|
Merge pull request #11117 from Citadel-Station-13/Ghommie-patch-1
Makes the mob holder examine less dumb, also indentation.
|
2020-02-19 19:02:34 -07:00 |
|
Hatterhat
|
9929cecec5
|
wack
|
2020-02-19 20:01:40 -06:00 |
|
kevinz000
|
8567346501
|
Merge pull request #10953 from Ghommie/Ghommie-cit564
The awesome adventures of the missing spurdo line replacement file.
|
2020-02-19 19:00:53 -07:00 |
|