kevinz000
088e586b47
Merge pull request #9601 from Ghommie/Ghommie-cit265
...
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-01-19 16:10:56 -07:00
Hatterhat
590d71ddc1
hey ghom i fixed it i think
2020-01-18 23:35:52 -06:00
Hatterhat
9aedc62ddb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920
2020-01-12 12:39:17 -06:00
Ghommie
c14439494a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
Hatterhat
080cb74893
tgstation 40920 tweaked and tested for cit
2020-01-10 22:56:11 -06:00
Ghommie
686a76dd1d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-04 13:35:05 +01:00
Ghommie
f5b251db66
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-03 18:24:39 +01:00
Lin
b1ccd512db
Merge pull request #10215 from Ghommie/Ghommie-cit473
...
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
2020-01-03 00:00:51 +00:00
Ghommie
b4c0433d6d
more work.
2019-12-27 17:45:19 +01:00
Ghommie
e74339ce8b
Jfc that's a lot of work!
2019-12-23 04:24:13 +01:00
Ghommie
9db79ff958
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-12-20 23:40:21 +01:00
Putnam3145
37cfec22aa
Merge pull request #10066 from Sishen1542/aaaaaaaa
...
neovgre qol changes
2019-12-17 11:40:43 -08:00
Putnam3145
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
Ghommie
5bf252a58c
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
2019-12-17 01:57:56 +01:00
DeltaFire
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
Lin
9ec8458803
Merge pull request #9983 from Ghommie/Ghommie-cit408
...
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-12-10 23:52:31 +00:00
Ghommie
414d4b7a90
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408
2019-12-09 00:04:22 +01:00
Ghommie
7cc332960b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
2019-12-07 05:30:07 +01:00
Ghommie
542c9007ee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-12-06 20:09:35 +01:00
Sishen
8da7d1a021
b
2019-12-06 06:38:48 -07:00
Linzolle
19b004edab
update butchering
2019-12-01 14:35:11 -06:00
Ghommie
3b8aebbbc2
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-11-29 00:40:16 +01:00
Ghommie
f9680130f9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
2019-11-27 18:48:20 +01:00
BlackMajor
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
kevinz000
755559bb66
Merge pull request #9836 from Ghommie/Ghommie-cit364
...
Ports "Uses defines for turf atmos"
2019-11-19 21:32:42 -07:00
Ghommie
a52e292cc8
Ports "examine-code refactor"... part 1...
2019-11-19 03:28:06 +01:00
Ghommie
641ddebed1
Ports "Uses defines for turf atmos"
2019-11-17 03:19:35 +01:00
DeltaFire15
9f8547d42d
Another sync ( #4 )
...
AAAAAAAAA
2019-11-16 16:12:12 +01:00
Ghommie
78c967fa20
A
2019-11-15 18:42:04 +01:00
Ghommie
2b104a7698
Ports "Fixes MMIs not being able to use mecha equipment"
2019-11-15 18:40:45 +01:00
Ghommie
f401e622c3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
2019-11-15 01:01:08 +01:00
kevinz000
02e8a73265
Merge pull request #9737 from Ghommie/Ghommie-cit326
...
Ports techweb backend refactor & co.
2019-11-14 16:45:09 -07:00
Ghommie
6484eea339
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-11-15 00:36:50 +01:00
Ghommie
09860d463f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-11-10 23:23:36 +01:00
Ghommie
298f2e02c6
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
2019-11-08 22:33:26 +01:00
Ghommie
b2b1390bd3
Ports techweb backend refactor & co.
2019-11-07 05:07:38 +01:00
Ghommie
6cf35a67b1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
2019-10-31 23:17:39 +01: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
Ghommie
a5b37b658b
Purging a lot of space indention in favor of tabs.
2019-10-29 15:46:31 +01:00
Ghommie
5fcf5b1c5e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-10-29 13:38:16 +01:00
Ghommie
e688d37390
Fixing nuke ops / adminspawn combat mechs having tracking beacons.
2019-10-28 18:33:39 +01:00
Ghommie
a5c95f20b6
typo.
2019-10-24 19:58:32 +02:00
Ghommie
2c578ca683
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2019-10-24 18:01:46 +02:00
Ghommie
e1928a18f1
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
deathride58
68813b6846
Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer
2019-10-22 19:14:12 -04:00
deathride58
ee0357b2c4
Merge pull request #9214 from Sishen1542/mechshit
...
properly ports neovgre from hippie
2019-10-21 21:17:57 -04:00
kevinz000
b0b274762c
Merge pull request #9441 from lolman360/whydowehave1000branches
...
Ports /tg/ advanced surgerytools and tool defines.
2019-10-11 12:10:31 -07:00
Sishen
363303747a
Update neovgre.dm
2019-10-08 10:27:48 -04:00
lolman360
04521551f0
one commit wonder
2019-10-08 19:46:28 +11:00