Commit Graph

6436 Commits

Author SHA1 Message Date
BlueWildrose def4b38a46 Revert "[DNM] Updates firemanning, throwing stuff" 2023-10-11 13:52:03 -06:00
SandPoot c3735c05ac Merge branch 'master' into throwing-updat 2023-10-04 15:15:15 -03:00
SandPoot 5a90dabd3c stuff 2023-10-03 23:22:57 -03:00
Lin bae4216c20 Merge pull request #16003 from SandPoot/held-plushies
Adds held sprites to plushes
2023-10-03 17:51:26 -04:00
SandPoot af33de25b4 the commit 2023-10-03 14:22:05 -03:00
SandPoot a034a96fc2 part 2 2023-10-02 13:54:40 -03:00
SandPoot 3c7e79d384 do after update 2023-09-09 15:39:49 -03:00
SandPoot 19ee7f8bd2 some hints 2023-07-19 20:51:25 -03:00
Jerry Wester 31e87bc2d7 Safeguard suit 2023-05-01 00:26:56 -05:00
Jerry Wester 22309324dc whitespace should not be syntax grrr 2023-05-01 00:23:09 -05:00
Jerry Wester 8271cf9bc1 move rescue plating to CMO locker 2023-05-01 00:22:59 -05:00
Jerry Wester 44c029176c remove signals_atom_movable.dm, revert jetpack 2023-05-01 00:19:48 -05:00
KrissKr0ss 66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
2023-05-01 00:16:20 -05:00
Lin d003e3faa5 Merge pull request #15979 from SandPoot/reflector-rotat
Reflectors will rotate inside shuttles - Rejoice supermatter shuttle builders
2023-03-15 14:43:40 -07:00
SandPoot f1eb8fe54f rotat 2023-03-14 15:06:18 -03:00
silicons 6efd3098d4 Merge pull request #15961 from zeroisthebiggay/sevakillmarktwo
Removes the SEVA suit, replacing it with the HEVA suit - an ash-storm proof alternative.
2023-03-04 23:36:36 -08:00
Lin 00fe11ee3a Merge pull request #15974 from SandPoot/does-aligning-the-correct-way
Does runechat aligning properly
2023-02-23 21:22:03 -07:00
SandPoot 2bdec078d7 Merge pull request #311 from Sandstorm-Station/duct-piping
Several duct pipe fixes/qol
2023-02-21 16:44:35 -03:00
SandPoot d287fc25ca poosh 2023-02-21 01:55:49 -03:00
SandPoot 2bf781580e Merge branch 'master' into new-decal-painter 2023-02-15 20:06:29 -03:00
Timothy Teakettle 71de9c13e3 Merge pull request #15962 from SandPoot/contextual-screentips
Contextual screentips -- Screentips now show you what items/objects can do
2023-02-15 23:04:54 +00:00
Timothy Teakettle 5f6e204866 Merge pull request #15940 from squib-bot/fermichemwork
Re-Adding Bounty Consoles
2023-02-11 00:06:37 +00:00
SandPoot 8ea39f9cf4 helpers 2023-02-10 00:39:04 -03:00
Timothy Teakettle 390dcbcea0 Merge pull request #15966 from SandPoot/accessory-equip
Adds accessory quick-equip, a tab for it on the loadout and previews for accessories on the prefs screen
2023-02-09 21:39:05 +00:00
SandPoot 78c28a40c7 sneaky hint about reskinning 2023-02-09 02:54:31 -03:00
SandPoot 4491abc2d7 updates to most recent version and puts intent hints! 2023-02-09 02:20:02 -03:00
SandPoot 1b1154260c correct everything and some intention based checks 2023-02-08 02:17:57 -03:00
SandPoot b955bc222b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter 2023-02-06 20:24:35 -03:00
SandPoot 5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
Timothy Teakettle f40584685b Merge pull request #15952 from zeroisthebiggay/sabre
very ready sabre resprite and minor sprite tweaks
2023-02-03 09:53:15 +00:00
SandPoot ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
zerothebigboy 091d9ec00f good 2023-01-30 00:01:22 -05:00
zerothebigboy 8776b8c0cc epic 2023-01-29 22:35:59 -05:00
zerothebigboy e76221f68b yeppers 2023-01-29 03:57:32 -05:00
zerothebigboy b8bc94ba13 man 2023-01-29 00:49:55 -05:00
SandPoot 44913d5fff Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter 2023-01-28 01:20:26 -03:00
SandPoot c60f36a42b files 2023-01-28 01:10:49 -03:00
President of Shit PRS d063144713 Re-Adding Bounty Consoles
Civilian bounties are great, don't get me wrong. But they're civilian bounties and it feels like cargo lost their thing to do, namely putting annoying sheets of paper everywhere. Plus checklists make the brain go ding when you work through them arooga.
2023-01-14 02:01:12 +00:00
Timothy Teakettle 35d01aa0f4 Merge pull request #15918 from LeDrascol/port-heirloom-update
[PORT] Non-global heirloom definitions
2023-01-12 23:39:41 +00:00
Timothy Teakettle c8fc27fc9c Merge pull request #15930 from SandPoot/reskinning
Update to reskinning
2023-01-11 01:00:35 +00:00
SandPoot 3b8d102fac puts pda in the system to remove shitcode 2023-01-10 20:02:12 -03:00
SandPoot cf51a4dce9 dusting off 2023-01-10 18:32:49 -03:00
SandPoot 6bbd44afe7 element time 2023-01-10 18:08:17 -03:00
SandPoot f066a260f2 previous could break 2023-01-09 08:05:48 -03:00
SandPoot c94aa43432 quick fix and little extra usage! 2023-01-08 22:02:30 -03:00
SandPoot f2a49bc319 first commit with everything 2023-01-08 21:36:57 -03:00
Jerry Wester ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
Lin efb2d19cb9 Merge pull request #15921 from LeDrascol/port-furrypride-graffiti
[PORT] Furry Pride graffiti
2023-01-07 16:38:34 -07:00
silicons 23327fa268 Merge pull request #15894 from JerryWester/modsuits
MODsuits
2023-01-07 14:07:28 -08:00
Darius 4bea655c8b Port Furry Pride graffiti
Ports the large "Furry Pride" graffiti from TG.
2023-01-05 17:38:02 -05:00