cyberpresidentvanellope/GS13-Citadel
1
0
Fork 0
mirror of https://github.com/evilew/GS13-Citadel.git synced 2026-08-23 05:08:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
48,998 Commits 9 Branches 0 Tags
master
Commit Graph
21309 Commits
Author SHA1 Message Date
SandPoot 06528b61ae Update files 2022-03-30 22:32:58 -03:00
siliconsandGitHub bfbba7cb06 blocks investigate log access without R_SENSITIVE (#15573) 
* Update admin_verbs.dm

* Update admin_verbs.dm

* Update sql_message_system.dm
 2022-03-30 12:42:05 -07:00
Putnam3145 6199aa4d60 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-03-30 12:35:12 -07:00
Solaris-Shade a4f8789d68 DO it not HIT it! 
https://github.com/tgstation/tgstation/pull/65061
 2022-03-24 22:43:17 -04:00
Solaris-ShadeandGitHub 01f28163c2 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-24 20:40:31 -04:00
LinandGitHub dbb2db5cc1 Merge pull request #15570 from bunny232/Oral 
Climax with partner now counts mouth
 2022-03-24 21:39:02 +00:00
SandPoot d711a0901c Dual seater coming right up. 2022-03-23 13:05:51 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot d8f656ecf1 restores EMP behavior 2022-03-23 10:26:58 -03:00
bunny232GitHubDeltaFire
 		554c38fedf Update code/modules/arousal/arousal.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2022-03-23 05:28:24 -04:00
Solaris-ShadeandGitHub 5596b04f5c Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-22 20:37:16 -04:00
SandPootandGitHub e9637bb688 Merge branch 'master' into deadmin-prefs 2022-03-22 15:35:46 -03:00
evan 8ddf825aa8 Update arousal.dm 2022-03-22 01:22:54 -04:00
siliconsandGitHub ff6ed43bc1 Merge pull request #15438 from LiteralMushroom/patch-5 
Makes it so alter form can affect eyes.
 2022-03-21 18:56:47 -07:00
Solaris-ShadeandGitHub fb4e27e536 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-21 17:21:14 -04:00
LinandGitHub 22a49c1dd7 Merge pull request #15564 from SandPoot/bad-getatomonturf 
Fixes balloon alerts sourced on turfs
 2022-03-20 22:30:34 +00:00
Solaris-ShadeandGitHub d9ff37d2ff Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-19 11:23:16 -04:00
SandPoot 16fddbb140 Upload files 2022-03-18 18:35:29 -03:00
SandPoot 3ee2d12b34 Upload files 2022-03-18 12:45:07 -03:00
SandPootandGitHub 96e38e965b Merge branch 'master' into mechs-are-vehicles 2022-03-17 22:23:48 -03:00
SandPoot baee52349b Upload files 2022-03-16 15:41:07 -03:00
SandPoot aec888a7b6 Update files 2022-03-16 15:17:57 -03:00
SandPoot a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
LinandGitHub c0da155ad5 Merge pull request #15553 from Putnam3145/fix-explosive-compressor 
Fix implosion compressor impossibility
 2022-03-15 19:24:17 +00:00
LinandGitHub e819fbdb83 Merge pull request #15546 from Putnam3145/fix-supermatter-exploit 
Makes supermatter take damage (and not heal) if too near to spaced turfs
 2022-03-14 18:47:09 +00:00
Putnam3145 b597675ef4 Fix explosive compressor impossibility 2022-03-14 11:41:20 -07:00
siliconsandGitHub fcfde73f5e Merge pull request #15425 from DeltaFire15/slower-organ-healing 
Nerfs* passive organ healing, plus some minor stuff
 2022-03-13 14:26:00 -07:00
siliconsandGitHub a3284a0923 Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf 
Weakens chemistry's revival chems
 2022-03-13 14:24:57 -07:00
DeltaFireandGitHub cb1848d06c no more free money (#15375) 2022-03-13 12:50:30 -07:00
Solaris-ShadeandGitHub 0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
Solaris-Shade 171bd18c8a Updated Projectile code some more. 2022-03-11 22:23:01 -05:00
Putnam3145 857253a07b who names a var T. 2022-03-10 21:42:27 -08:00
siliconsandGitHub 2a5a79f751 Merge pull request #15536 from SandPoot/JPS 
Implements JPS (Jump Point Search) Pathfinding
 2022-03-10 16:51:07 -07:00
siliconsandGitHub cdefa4f64a Merge pull request #15535 from SandPoot/statpanel 
Statpanel update
 2022-03-10 16:50:59 -07:00
siliconsandGitHub b1ba1d60f0 Merge pull request #15534 from SandPoot/screentips 
Screentips
 2022-03-10 16:50:28 -07:00
siliconsandGitHub 234b3eae8f Merge pull request #15540 from Citadel-Station-13/more-tritium-enthalpy 
Adds a LOT more enthalpy to tritium
 2022-03-10 16:47:15 -07:00
Putnam3145 a44d0af4dc hackish supermatter dying on spaced nearby turfs 2022-03-09 07:49:02 -08:00
Putnam3145andGitHub 993db66237 Adds a LOT more enthalpy to tritium 2022-03-06 14:54:48 -08:00
Solaris-Shade c5be81c589 tg moved projectiles out of /item, added '/item' back 2022-03-06 16:29:58 -05:00
Putnam3145 062da9bb05 fixed dynamic days (lowertext) 2022-03-06 13:18:59 -08:00
Solaris-Shade 2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update 
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
 2022-03-06 15:20:23 -05:00
SandPoot 7bf1bcf857 Some updates 2022-03-05 16:18:17 -03:00
SandPoot 21b68944e7 Upload files 2022-03-05 16:00:12 -03:00
SandPoot 5f083fbddd Upload files 2022-03-05 14:22:42 -03:00
SandPoot 45a49c6106 Upload files 2022-03-05 13:49:26 -03:00
Timothy TeakettleandGitHub 778bf1777b fixes coiling issue (#15530) 
* why

* new signals for resting and stop pulling

these are to be used as signals that will cancel the coiling

* Create coiling.dm

* Update coiling.dm

* adds sprite accessory for coiled naga

* main changes that apply the actual visuals to the coiling mechanics

* adds message to coiling, fixes offset, adds action icon

* coil offset was using old direction

* reordering

* fixes coil sprite not disappearing

* fixes offsets, solves loadout issue

* follows lin's suggestion and adds support for slimes by making it entirely handled in handle mutant

* fix

* Update preferences.dm

* no slimes you're not allowed the hidden sprite
 2022-02-28 14:01:57 -08:00
LinandGitHub ae5896d6cf Merge pull request #15525 from keronshb/ambitioncheck 
Ambitions from Skyrat
 2022-02-27 02:34:13 +00:00
siliconsandGitHub 2323bd31cd Merge pull request #15522 from bunny232/wintercoats 
Insulation works both ways you know.
 2022-02-26 18:08:59 -07:00
siliconsandGitHub edd3a510f1 Merge pull request #15526 from timothyteakettle/bartender-pda 
adds bartender cartridge for drink recipe searching, updates chemist cartridge to have equivalent functionality for all recipes
 2022-02-26 18:08:47 -07:00
siliconsandGitHub bf9afd846d Merge pull request #15528 from SandPoot/time-to-kill-this-broken-system 
[PORT] Removes the non bitflag slot defines
 2022-02-26 18:08:28 -07:00