cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 02:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,341 Commits 55 Branches 0 Tags
bf562de84ec84c7accc0cd1e428c7b51aee2c06c
Commit Graph

25341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghommie
1b8bda7040 Fixes some average runtimes, how null... 2019-10-30 00:48:51 +01: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
9f00423bbd Fixing the deep space gorilla. 2019-10-29 21:51:00 +01:00
Ghommie
6a64647ee8 Fixing dogborg sleepers runtimes, how atrocious... 2019-10-29 19:45:10 +01:00
dependabot[bot]
22c87b0791 Bump pillow from 5.1.0 to 6.2.0 in /tools/mapmerge2 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 5.1.0 to 6.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/5.1.0...6.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-10-29 14:09:47 +00:00
CitadelStationBot
d0bf24c7cc Automatic changelog generation for PR #9649 [ci skip] 2019-10-29 03:48:37 -05:00
BlackMajor
edfa1d0bae Merge pull request #9649 from Thalpy/JacqFixes 
[Expedite][Halloween] Damnit Jacq stop bothering the AI
 2019-10-29 21:48:35 +13:00
Fermi
be470c2d18 Oranges are high 2019-10-29 08:07:11 +00:00
Fermi
5356afa9e6 Barthhhh 2019-10-29 06:14:31 +00:00
Putnam
df3d5ab51f always gotta be one, at least 2019-10-28 23:05:22 -07:00
Putnam
cb88fd1a44 added dynamic antag injection to config 2019-10-28 22:58:35 -07:00
CitadelStationBot
4716381918 Automatic changelog generation for PR #9641 [ci skip] 2019-10-28 23:44:38 -05:00
BlackMajor
1cfc477f36 Merge pull request #9641 from Citadel-Station-13/kevinz000-patch-100 
A more "fun" nerf to trashbags (and some FUCK-tier code refactoring for storage components to make it happen)
 2019-10-29 17:44:35 +13: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
Thalpy
2636398e60 WEBEDITS 2019-10-29 03:50:49 +00:00
Hatterhat
ebd05a3fb1 today i will make a one line fix and steal it from sishen 2019-10-28 22:39:46 -05:00
Thalpy
e71dc54594 i-- 2019-10-29 03:29:56 +00:00
Thalpy
a1e611e7aa Heck 2019-10-29 03:23:46 +00:00
Thalpy
39f7116353 Oops 2019-10-29 03:22:21 +00:00
Ghommie
f42e835add tweak. 2019-10-29 03:09:38 +01:00
CitadelStationBot
503af59b16 Automatic changelog generation for PR #9637 [ci skip] 2019-10-28 20:17:36 -05:00
deathride58
624d562995 Merge pull request #9637 from Citadel-Station-13/byond_513 
BYOND 513 preliminary support
 2019-10-28 21:17:33 -04:00
Ghommie
f725afae64 Random plush spawner tweaks and fixes. 2019-10-29 02:06:22 +01:00
Ghommie
502b02303b Arcade machine directional sprites. 2019-10-28 23:31:39 +01:00
CitadelStationBot
0806b19a5d Automatic changelog generation for PR #9636 [ci skip] 2019-10-28 16:36:52 -05:00
BlackMajor
5894b148a8 Merge pull request #9636 from Ghommie/Ghommie-cit282 
Gang dominator sprite update.
 2019-10-29 10:36:50 +13:00
BlackMajor
ba9c99644d Merge pull request #9640 from Linzolle/hat-toss 
I broke hats oops
 2019-10-29 10:00:52 +13:00
Ghommie
e688d37390 Fixing nuke ops / adminspawn combat mechs having tracking beacons. 2019-10-28 18:33:39 +01:00
Ghommie
3b51c3c5be Fixing invisible blackberry n strawberry chocolate cake slices. 2019-10-28 18:20:58 +01:00
Ghommie
8c4e031a1b atom/movable's Destroy() calls MoveToNullSpace() which calls Exited(), thus handle_atom_del() is redunant. 2019-10-28 17:59:32 +01:00
Ghommie
68b1583a1a Fixing PKA mod double installation et similars. 2019-10-28 17:47:29 +01:00
kevinz000
935af3c21f Merge pull request #9643 from BlackMajor/master 
Keb told me he'd speedmerge a quickfix for the gorilla shuttle being the deadliest shuttle.
 2019-10-27 22:14:49 -07:00
BlackMajor
3ab0e8950e Bet 2019-10-28 18:07:13 +13:00
kevinz000
46dabe25bb Update storage.dm 2019-10-27 21:35:37 -07:00
CitadelStationBot
1010ff90fc Automatic changelog generation for PR #9570 [ci skip] 2019-10-27 23:02:36 -05:00
BlackMajor
cc3eefff29 Merge pull request #9570 from Citadel-Station-13/kevinz000-patch-105 
Gives peacekeeper cyborgs a megaphone
 2019-10-28 17:02:34 +13:00
BlackMajor
6a7a121d56 Merge pull request #8856 from Citadel-Station-13/magrifles_again 
Security Gun Rebalancing Electric Boogaloo - overhauls magrifles/magpistols, burst fire autorifles, nerfs laser carbines, resprites energy guns
 2019-10-28 16:47:02 +13:00
kevinz000
d7e8b5209f Update bags.dm 2019-10-27 20:36:32 -07:00
kevinz000
d390dc30fd Update storage.dm 2019-10-27 20:35:27 -07:00
BlackMajor
5ed6de4e26 Merge pull request #9639 from Ghommie/Ghommie-cit283 
Quickfixing hypospray missin icons.
 2019-10-28 16:30:36 +13:00
BlackMajor
c4068508ca Merge pull request #16 from Citadel-Station-13/master 
Sync
 2019-10-28 16:28:56 +13:00
kevinz000
1211cf43e9 Update storage.dm 2019-10-27 20:25:07 -07:00
Ghommie
5d4bd71556 lil flashy male bat chest fix i dislike furries 2019-10-28 04:04:47 +01:00
deathride58
2c017b1f86 Merge pull request #9633 from Citadel-Station-13/onionneck 
onion necklace
 2019-10-27 20:43:01 -04:00
deathride58
c1742c0572 applies ghommie's suggested change 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-10-27 20:41:44 -04:00
Ghommie
13e06cdef3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit244 2019-10-28 01:37:10 +01:00