e3844ee1f9
wups
2019-12-17 21:05:21 -07:00
5a2ef22633
buckle others
2019-12-17 21:03:37 -07:00
70e50e57cd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-12-17 20:21:49 -06:00
5ef7d9cbf7
why did i not have revs as conversion
2019-12-17 16:09:40 -08:00
e6e68ae1a3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into storytellers
2019-12-17 14:18:19 -08:00
ddd3676903
Merge branch 'master' into glassware
2019-12-17 15:18:30 -05:00
0f5c8db456
Merge branch 'master' into donut
2019-12-17 15:12:51 -05:00
7017ab243b
Merge pull request #10216 from Ghommie/Ghommie-cit474
...
Porting a few martial art code updates.
2019-12-17 11:47:19 -08:00
37cfec22aa
Merge pull request #10066 from Sishen1542/aaaaaaaa
...
neovgre qol changes
2019-12-17 11:40:43 -08:00
0adcb900c1
Merge pull request #10155 from Seris02/windowfix
...
adds some distance checks to some things
2019-12-17 11:34:13 -08:00
10f0fa6868
Merge pull request #10203 from DeltaFire15/mechaccess
...
Nukies and deathsquaddies can now finally fix their mechs internal fires
2019-12-17 11:32:56 -08:00
670141edf7
Merge pull request #10209 from Ghommie/Ghommie-cit470
...
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-17 11:26:36 -08:00
95c0eddc2a
Merge pull request #10072 from Useroth/new-tg-plants
...
Ported bamboo stuff from tg.
2019-12-18 01:02:29 +13:00
3f06661de5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit453
2019-12-17 03:34:11 +01:00
6b7dcbceb0
Porting a few martial art code updates.
2019-12-17 03:19:07 +01:00
237fbaa02d
Merge pull request #10180 from Ghommie/Ghommie-cit462
...
[s] virtual reality component improvements, fixes and documentation.
2019-12-17 01:05:10 +00:00
5bf252a58c
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
2019-12-17 01:57:56 +01:00
80402a0d88
Ports some hud and update_icon code updates.
2019-12-16 23:29:20 +01:00
1701811fb6
kay
2019-12-16 11:35:04 -07:00
447f416ca6
Merge branch 'Ghommie-cit470' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit471
2019-12-16 19:10:07 +01:00
93fbc17428
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-16 17:58:50 +01:00
b3ad352a96
stuff
2019-12-16 08:10:41 -07:00
b0e8fb42cd
AAAAA
2019-12-16 14:00:14 +01:00
05497bb392
Changes required to enable for maintenance protocols
...
All combat mechs that are special get their internals_access increased so the pilots of the deathsquad / nuke team can fix up their mechs without having to steal a robotics ID. Also removes engineering from being able to access mech internals, seems weird to have if only robotics is allowed to handle mechs, probably remnant of engineering robotics?
2019-12-16 11:25:11 +01:00
b54c8a6a2a
Merge pull request #9736 from Citadel-Station-13/kevinz000-patch-113
...
I want to have a word with whoever wrote the original antagonist reputation proc
2019-12-16 03:20:38 +00:00
3b47949f82
haha fuck that's a lotta changes
2019-12-15 19:59:15 -07:00
fb6b01a4ae
testing, further improvements. Tired.
2019-12-16 02:29:53 +01:00
74cc1ec547
Merge pull request #10177 from BlackMajor/FIST
...
NUCLEAR FIST. A new wizard spell involving punching people so hard they explode.
2019-12-16 14:14:35 +13:00
491958475b
fixed
2019-12-15 18:48:50 -06:00
6a5a098458
Fixing the blood bank generator.
2019-12-16 01:43:21 +01:00
f244ac84b2
whoops
2019-12-15 15:25:47 -08:00
138f2d05f0
Made intrigue not care about valid.
2019-12-15 14:49:43 -08:00
3d0d1de94c
Added bloodsucker weights.
2019-12-15 14:49:32 -08:00
3b526fdb9b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into storytellers
2019-12-15 14:41:47 -08:00
c39a5d0462
Merge pull request #10011 from Arturlang/Bloodsuckers
...
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
f943bcb3b5
make cowabunga description less, uh, bad
2019-12-15 12:17:07 -08:00
b7d082a204
Merge pull request #10144 from Linzolle/sabre-noise
...
makes the officer's sabre play the un/sheating noise properly
2019-12-15 12:08:46 -08:00
c6732bb516
typo lol
2019-12-16 01:28:34 +13:00
4b177c4956
Adjusted NF balance
2019-12-16 01:20:14 +13:00
586dcb6f81
welp i got lazy
2019-12-15 00:15:32 -07:00
4970675467
s
2019-12-15 00:06:11 -07:00
b96d36e719
alright that's that
2019-12-14 20:01:30 -08:00
43646434a0
Merge pull request #10163 from Ghommie/Ghommie-cit455
...
Allows blood bank generators to be wrenched and unwrenched.
2019-12-14 23:59:58 +00:00
967bcce38e
actually i still need this
2019-12-14 14:17:05 -08:00
0deaebc4ca
voting makes everything dumb
2019-12-14 14:16:02 -08:00
e1f0c52b96
that's storytellers. time for voting
2019-12-14 14:13:23 -08:00
3891c91799
virtual reality component improvements, fixes and documentation.
2019-12-14 17:19:48 +01:00
2e003b7383
Merge pull request #10050 from Ghommie/Ghommie-cit427
...
Adds view and viewers checks for ranged construction devices such as ARCD and RLD.
2019-12-14 05:33:31 +00:00
59d0376985
finished
2019-12-14 17:31:26 +13:00
a1cc129d0b
slightly better storage, cucks the surgery duffel
2019-12-13 21:10:12 -06:00
kevinz000