cyberpresidentvanellope/GS13-Citadel
1
0
Fork 0
mirror of https://github.com/evilew/GS13-Citadel.git synced 2026-08-16 01:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
16,479 Commits 9 Branches 0 Tags
f21cac1af2f973886c19bdb3691d6a67cf5dc115
Commit Graph
6161 Commits
Author SHA1 Message Date
LetterJayandGitHub f21cac1af2 Merge pull request #6700 from Citadel-Station-13/upstream-merge-37399 
[MIRROR] Use spritesheets to reduce time spent sending PNG assets by 90+%
 2018-05-12 17:04:23 -05:00
deathride58andGitHub 20ac9089a7 Merge pull request #6678 from Citadel-Station-13/upstream-merge-37710 
[MIRROR] Makes eye of god lava & fire proof
 2018-05-11 03:45:28 +00:00
deathride58andGitHub 37b9d589ad Merge pull request #6679 from Citadel-Station-13/upstream-merge-37396 
[MIRROR] Track admin observer time
 2018-05-11 03:45:11 +00:00
deathride58andGitHub a980e323b9 Merge pull request #6680 from Citadel-Station-13/upstream-merge-37727 
[MIRROR] [s] Removes some stationloving-related failure surface
 2018-05-11 03:44:29 +00:00
deathride58andGitHub ebcb0c45fe Merge pull request #6683 from Citadel-Station-13/upstream-merge-37571 
[MIRROR] Integrated Circuits: String parsing update
 2018-05-11 03:42:12 +00:00
deathride58andGitHub 8954754e7a Merge pull request #6684 from Citadel-Station-13/upstream-merge-37683 
[MIRROR] Replaces the Roman Shield and Roman Helmets in the autodrobe with fake versions with no block chance nor armour values.
 2018-05-11 03:41:53 +00:00
deathride58andGitHub e0f971ecbb Merge pull request #6693 from Citadel-Station-13/upstream-merge-37457 
[MIRROR] Adds a French beret! HONH HONH HONH!
 2018-05-11 03:41:26 +00:00
deathride58andGitHub 4364d2bff5 Merge pull request #6696 from Citadel-Station-13/upstream-merge-37689 
[MIRROR] Makes it a bit easier to see radiation with engine goggles
 2018-05-11 03:40:10 +00:00
deathride58andGitHub 852d2a529e Merge pull request #6698 from Citadel-Station-13/upstream-merge-37548 
[MIRROR] fixes some inconsistency in the bulldog shotgun ammo
 2018-05-11 03:39:31 +00:00
deathride58andGitHub 93aa92820d Merge pull request #6701 from Citadel-Station-13/upstream-merge-37770 
[MIRROR] Fixes anomalies not listening on the correct frequency
 2018-05-11 03:38:38 +00:00
deathride58andGitHub b38424653c Merge pull request #6703 from Citadel-Station-13/upstream-merge-37656 
[MIRROR] Fixes EMPs not working on people/backpacks/other storage being carried on people
 2018-05-11 03:36:01 +00:00
deathride58andGitHub f2e7c305a5 Merge pull request #6709 from Citadel-Station-13/upstream-merge-37748 
[MIRROR] brings gender equality on /tg/station
 2018-05-11 03:33:57 +00:00
YPOQandletterjay afe80d808b Fixes gorillas not having hand slots (#37762) 2018-05-10 20:52:38 -05:00
Tlaltecuhtliandletterjay 4a8df6a701 Bring gender equality to Corgi crates (#37748) 
* brings gender equality on /tg/station
* what if this works
 2018-05-10 19:57:20 -05:00
LetterJayandGitHub 8948acfce2 Merge pull request #6691 from Citadel-Station-13/upstream-merge-37753 
[MIRROR] Makes the cultblade use the right inhand files
 2018-05-10 10:12:56 -05:00
LetterJayandGitHub 0e27471a77 Merge pull request #6690 from Citadel-Station-13/upstream-merge-37704 
[MIRROR] Adds drone hats for some holidays
 2018-05-10 10:12:08 -05:00
kevinz000andletterjay 3819a5a9b5 Fixes EMPs (#37656) 2018-05-10 01:33:25 -05:00
YPOQandletterjay f459f909c0 Fixes anomalies not listening on the correct frequency 2018-05-09 22:45:09 -05:00
Tad Hardestyandletterjay 111ad79eab Use spritesheets to reduce time spent sending PNG assets by 90+% 2018-05-09 22:44:57 -05:00
Tlaltecuhtliandletterjay 325b31f11e fixes some inconsistency in the bulldog shotgun ammo (#37548) 
the default bulldog shotgun ammo makes sense now
 2018-05-09 16:24:17 -05:00
kevinz000andletterjay 44dac80383 Makes it a bit easier to see radiation 2018-05-09 16:20:48 -05:00
Ordonisandletterjay ab81220eda Adds a French beret! HONH HONH HONH! (#37457) 
This is very similar to the Italian Moustache, but it's a beret. This will be part of a series of language items. Happy to entertain suggestions as to whether it should be a roundstart item or randomly scattered about maint/cargo crate restricted. In the spirit of atomizing PRs, this one will just be for the French Beret.

Ready for merge.
 2018-05-09 16:03:28 -05:00
Lexorionandletterjay 2c33868d8a makes the cultblade use the right inhand files 2018-05-09 15:48:40 -05:00
Dentonandletterjay 6edd272d76 drone masks for holidays 2018-05-09 13:42:54 -05:00
Tlaltecuhtliandletterjay 51b6a296d3 fixes a money loop 
🆑 
fix: fixes a possible money exploit
/🆑

why: if you buy the barrier crate, open it, spam all the grenades in vertical mode u ll get more money that the crate is worth
before: 4 grenades -> 12 barriers * 375 credits -> 4500 + 500 (crate) + 200 (manifest) -> 5200 which is a +3200 net gain
now:  4 grenades -> 12 barriers * 100 credits -> 1200+ 500 (crate) + 200 (manifest) -> 1900 which is a -100 net loss
 2018-05-09 13:40:13 -05:00
Firecageandletterjay 694726e89d Replaces the Roman Shield and Roman Helmets in the autodrobe with fake versions with no block chance nor armour values. (#37683) 
* removes the block chance from the Roman Shield.

* replaces the Roman Shield in the autodrobe with a toy version with no block chance.

* replaces the armoured roman helmets from the autodrobe with fake ones.
 2018-05-09 00:49:19 -05:00
PKPenguin321andletterjay b873222eba Integrated Circuits: String parsing update (#37571) 
* circuit tweaks
two new variants of concatenators: small and large. each have corresponding complexity and inputs
find text circuit now has two pulse outs, one for if it finds the text, one for if it does not. may break some old circuits but should be easy to fix

* readds after search pulse out

* adds length circuit for strings

* null delimiter in exploder returns list of all chars

* adds indexer circuit

* actual null check

* better descs

* addresses review

removed unneeded var

* moves concatenator pin setup to initialize
 2018-05-09 00:44:59 -05:00
vuonojenmustaturskaandletterjay 003eced6af [s] Removes some stationloving-related failure surface (#37727) 
COMSIG_TRY_STORAGE_TAKE fails, leaving the disk out-of-bounds. forceMove HAS to be good enough here.
 2018-05-08 16:40:56 -05:00
Jordan Brownandletterjay baee4dead5 Merge pull request #37396 from KorPhaeron/mrcitruswantsyoutoclockin 
Track admin observer time
 2018-05-08 13:38:13 -05:00
FrozenGuy5andletterjay a4410b2aec Makes eye of god lava & fire proof (#37710) 
* Makes eye of god lava & fire proof

* eye of god is fire and lava proof
 2018-05-08 13:21:37 -05:00
Naksuandletterjay eb4743e5a9 every fucking time 2018-05-08 09:21:36 -05:00
deathride58andGitHub 37d65a54ff Merge pull request #6666 from Citadel-Station-13/upstream-merge-37632 
[MIRROR] Shows assemblies some love. ♥
 2018-05-07 19:41:21 +00:00
LetterJayandGitHub 5d18d53566 Merge pull request #6673 from Citadel-Station-13/kevinz000-patch-2 
Allows anyone to reboot on OOM situations
 2018-05-07 09:20:59 -05:00
LetterJayandGitHub 893783188f Merge pull request #6672 from Citadel-Station-13/kevinz000-patch-1 
tesla coil runtime fix
 2018-05-07 09:20:42 -05:00
deathride58andGitHub be42e97101 Update helpers.dm 2018-05-07 08:47:44 -04:00
deathride58andGitHub f15f3ffea4 Merge pull request #6662 from Citadel-Station-13/upstream-merge-37648 
[MIRROR] Moves removing the cell to screwdriver_act for APCs
 2018-05-07 12:45:42 +00:00
deathride58andGitHub 9b7518e1e2 Merge pull request #6665 from Citadel-Station-13/upstream-merge-37578 
[MIRROR] Fix the top menus in the skin not working
 2018-05-07 12:44:35 +00:00
kevinz000andGitHub 79d0a12884 Allows anyone to reboot on OOM situations 2018-05-07 03:07:09 -07:00
kevinz000andGitHub 33e6ef93f1 runtime fix 2018-05-06 20:17:15 -07:00
deathride58andCitadelStationBot 06fc24e953 Makes it plausible for the lone operative event to roll if the nuclear disk stays still for long enough (#37468) 
* makes it possible for the lone operative event to roll if the nuclear disk stays still for long enough

* makes the event weight increase chance reset if the disk moves

* slows this shit *WAY* down, adds a minimum time for the weight to start rolling for an increase (approximately 10 minutes)

* .

* this was an absolute pain in the ass to test - addresses reviews

* addresses ninjanomnom's review, makes it possible for the loneop event weight to decrease if the disk moves
 2018-05-06 16:38:25 -05:00
ShizCalevandCitadelStationBot 6415ecdbe9 Shows assemblies some love. ♥ 2018-05-06 16:37:40 -05:00
Tad HardestyandCitadelStationBot af5e898dab Fix the top menus in the skin not working 2018-05-06 16:37:31 -05:00
Jordan BrownandCitadelStationBot 81deaaca6d Merge pull request #37648 from vuonojenmustaturska/apcunsmash 
Moves removing the cell to screwdriver_act for APCs
 2018-05-06 16:37:04 -05:00
deathride58andGitHub 11c1e8fbf7 Merge pull request #6632 from Citadel-Station-13/upstream-merge-37620 
[MIRROR] Remove a leftover reference to the gang dominator
 2018-05-06 07:03:37 +00:00
kevinz000andCitadelStationBot 6669328929 alt morph nerf (#37654) 2018-05-05 14:54:06 -05:00
LetterJayandGitHub bf66827936 Merge pull request #6652 from Citadel-Station-13/upstream-merge-37641 
[MIRROR] Use bundled rather than remote jquery in tooltips
 2018-05-05 09:44:39 -05:00
LetterJayandGitHub f387bb1694 Merge pull request #6633 from Citadel-Station-13/upstream-merge-37622 
[MIRROR] Changes cockroach guts to insect guts
 2018-05-05 09:40:11 -05:00
LetterJayandGitHub 4dd07fe4e7 Merge pull request #6641 from Citadel-Station-13/upstream-merge-37447 
[MIRROR] Fixes mousetraps not going off from being dumped out
 2018-05-05 09:38:11 -05:00
Jordan BrownandCitadelStationBot 7104f28ed8 Merge pull request #37651 from 81Denton/donksoft-board 
Adds missing donksoft vendor board to illegal tech node
 2018-05-05 08:11:04 -05:00
Jordan BrownandCitadelStationBot 6a940a7149 Merge pull request #37641 from AutomaticFrenzy/patch/tooltip-jquery 
Use bundled rather than remote jquery in tooltips
 2018-05-05 08:10:54 -05:00