Commit Graph
18141 Commits
Author SHA1 Message Date
CitadelStationBot a226e49b16 Automatic changelog generation for PR #7381 [ci skip] 2018-07-18 17:08:13 -05:00
deathride58andGitHub 815767d475 Merge pull request #7381 from ursamedium/minor
Minor grammar fix + crow pAI rest fix
2018-07-18 18:08:08 -04:00
deathride58andGitHub d4fac96c70 Merge pull request #7374 from Citadel-Station-13/kevinz000-patch-1
hardcaps stamina to 200 again
2018-07-18 18:07:37 -04:00
deathride58andGitHub f9e7b491ae Merge pull request #7370 from Citadel-Station-13/kevinz000-patch-3
gives AI smartfridge interaction why not we already caved and let them fuck wtih vending machines
2018-07-18 18:07:10 -04:00
Bear dc8ec8065a crow pai resting pose 2018-07-18 01:32:46 -04:00
Bear 586d3a3456 super minor fix 2018-07-18 01:22:56 -04:00
deathride58andGitHub d2e76ac67e Merge pull request #7369 from Citadel-Station-13/kevinz000-patch-2
Fixes doppler arrays detecting explosions it shouldn't detect
2018-07-17 11:19:53 -04:00
deathride58andGitHub f74eff85ba Merge pull request #7365 from Trilbyspaceclone/patch-6
Makes Revs have a min pop needed
2018-07-17 11:19:27 -04:00
deathride58andGitHub a18525ad06 Merge pull request #7366 from Citadel-Station-13/mirror-38933
[requires testmerge]upstream mirror - projectile pathing/hitscan lighting refactor
2018-07-17 11:19:07 -04:00
deathride58andGitHub a89fef2596 Merge pull request #7377 from Citadel-Station-13/kevinz000-patch-4
flashes are no longer invisible
2018-07-16 18:36:14 -04:00
kevinz000andGitHub 6b1dbf8561 Update flash.dm 2018-07-16 15:33:53 -07:00
kevinz000andGitHub e3d7ce9793 Update damage_procs.dm 2018-07-16 01:50:33 -07:00
kevinz000andGitHub f081239613 Update damage_procs.dm 2018-07-15 23:00:48 -07:00
deathride58andkevinz000 b727404f48 Adds jukebox music folder to gitignore (#7371) 2018-07-15 16:01:10 -07:00
deathride58andGitHub 0fb43d5c4b Merge pull request #7364 from Citadel-Station-13/kevinz000-patch-1
flightsuit speed rebalancing
2018-07-15 17:52:26 -04:00
CitadelStationBot e68f807d2e Automatic changelog generation for PR #7363 [ci skip] 2018-07-15 16:52:00 -05:00
deathride58andGitHub fdcedaf506 Merge pull request #7363 from ursamedium/cosmetics
New pAI holochassis options, display images
2018-07-15 17:51:58 -04:00
deathride58andGitHub 10b9e8ab99 Merge pull request #7023 from Citadel-Station-13/lmao
Telebatons/policebatons buffed to be a viable stun weapon (but not as good as stunbatons/prods), secways nerfed to non-sprint movespeed with sprint buffer (but this time they're actually responsive instead of being laggy and the buffer is weaker)
2018-07-15 17:51:12 -04:00
kevinz000andGitHub 0e13b3b1c6 Update smartfridge.dm 2018-07-14 23:44:52 -07:00
kevinz000andGitHub abd38ba0f2 Update doppler_array.dm 2018-07-14 23:34:42 -07:00
kevinz000andGitHub b33d2b82fb Merge branch 'master' into mirror-38933 2018-07-14 15:26:49 -07:00
kevinz000 bcb1b04c40 Upstream mirror 2018-07-14 15:24:35 -07:00
TrilbyspacecloneandGitHub c0bd256178 Makes revs have a min pop needed
Needs 20 players min to make sure there is a Head and at lest one sec officer more then likely
2018-07-13 11:32:47 -04:00
kevinz000andGitHub b8b495ba42 Update species.dm 2018-07-12 09:38:31 -07:00
Bear 88fb190bed display images modularizing 2018-07-10 18:05:16 -04:00
kevinz000andGitHub 0b8e72b19b nerf 50-->40 2018-07-10 05:58:44 -07:00
Bear 4f48bc2dd5 pAI screen displays 2018-07-10 07:37:16 -04:00
Bear 82f513d204 holochassis options 2018-07-10 07:10:15 -04:00
deathride58andGitHub c8b9e94d1e Merge pull request #7354 from Trilbyspaceclone/patch-6
Removes armor form Non-head only Trek suits
2018-07-10 02:04:18 -04:00
deathride58andGitHub 914967f081 Merge pull request #7356 from Trilbyspaceclone/WT-550
Hopefully this will add in the missing WT-550 Toxin Ammo for sec
2018-07-10 02:03:08 -04:00
deathride58andGitHub 1145a66ec3 Merge pull request #7345 from LetterN/patch-5
adds plushnar and plushvar on chapvendors
2018-07-10 02:01:21 -04:00
deathride58andGitHub 93ce09f63f Merge pull request #7357 from LetterN/mapsmapsmaps
readds the cryo and lewdstuff on the map
2018-07-10 02:00:44 -04:00
deathride58andGitHub 0235f37fd0 Merge pull request #7339 from Trilbyspaceclone/patch-3
Adds more to the Autodrobe coin slot!
2018-07-10 02:00:06 -04:00
deathride58andGitHub fc9b99173b Merge pull request #7344 from LetterN/fix-1
fixes lewd handcuffs
2018-07-10 01:59:36 -04:00
deathride58andGitHub 4f5eb02cca Merge pull request #7338 from Citadel-Station-13/upstream-merge-38649
[MIRROR] Converts antimagic from GetComponent to a signal
2018-07-10 01:59:14 -04:00
deathride58andGitHub 21b6c7986b Merge pull request #7193 from Citadel-Station-13/kevinz000-patch-13
Cyborgs now drop their encryption keys on detonation/deconstruction
2018-07-10 01:58:59 -04:00
deathride58andGitHub 78241f4237 Merge pull request #7351 from Citadel-Station-13/upstream-merge-38930
[MIRROR] Cleans up other components destroys
2018-07-10 01:58:36 -04:00
deathride58andGitHub d904b54e7c Merge pull request #7350 from Citadel-Station-13/upstream-merge-38929
[MIRROR] Fixes animals trying to break map border
2018-07-10 01:58:19 -04:00
CitadelStationBot d1d6f8d6a3 Automatic changelog generation for PR #7349 [ci skip] 2018-07-10 00:58:04 -05:00
deathride58andGitHub bf89d077ba Merge pull request #7349 from Citadel-Station-13/upstream-merge-38932
[MIRROR] Disables knockdown/throw on supply shuttle docking
2018-07-10 01:58:02 -04:00
deathride58andGitHub 8025ba5a1f Merge pull request #7348 from Citadel-Station-13/upstream-merge-38935
[MIRROR] minor turf reservation fix - no longer reserves 1 more height+width than necessary, checks against invalid sizes
2018-07-10 01:57:46 -04:00
CitadelStationBot 8942d90a66 Automatic changelog generation for PR #7346 [ci skip] 2018-07-10 00:57:32 -05:00
deathride58andGitHub 03f3c6b993 Merge pull request #7346 from Citadel-Station-13/upstream-merge-38927
[MIRROR] Improves cargo shuttle/firefighting foam descs
2018-07-10 01:57:30 -04:00
deathride58andGitHub 4cdd3bbaa1 Merge pull request #7352 from Citadel-Station-13/upstream-merge-38931
[MIRROR] Fixes pulse rifles exploding structures in nullspace and that sort of thing
2018-07-10 01:57:08 -04:00
CitadelStationBot 762b789622 Automatic changelog generation for PR #7353 [ci skip] 2018-07-10 00:56:49 -05:00
deathride58andGitHub 55e5d803aa Merge pull request #7353 from Citadel-Station-13/upstream-merge-38883
[MIRROR] Bedsheets once again influence dreams.
2018-07-10 01:56:47 -04:00
CitadelStationBot 33e732d983 Automatic changelog generation for PR #7355 [ci skip] 2018-07-10 00:56:34 -05:00
deathride58andGitHub 8b58db057e Merge pull request #7355 from Citadel-Station-13/upstream-merge-38934
[MIRROR] Fix constructed directional windows leaking atmos, wrap setting of the anchored var on objects
2018-07-10 01:56:32 -04:00
deathride58andGitHub 6a5087877b Merge pull request #7129 from PolymorphBlue/vTecControl
Modifies the vTec cyborg upgrade to be toggleable between off/half/full
2018-07-09 00:26:23 -04:00
CitadelStationBot 8ea39ec1b6 Automatic changelog generation for PR #7358 [ci skip] 2018-07-07 20:09:26 -05:00