cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-26 14:48:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
49,788 Commits 8 Branches 0 Tags
modsuit-update
Commit Graph
36 Commits
Author SHA1 Message Date
SandPoot f1f6ac0109 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-31 22:14:23 -03:00
Letter NandGitHub bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 32a6e63698 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-27 23:11:54 -03:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot 13e0116894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-29 11:09:28 -03:00
necromanceranne 0f04bbb23b Ports a significant amount of the tg cybernetic organ code while making some additional changes to their power 2021-04-22 13:06:31 +10:00
SandPoot c79e8434cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-08 11:31:10 -03:00
MrJWhit ba98a0aacd Update miscellaneous.dm 2021-01-06 14:42:00 -05:00
MrJWhit abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
SandPoot af0f6e7bd0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-18 23:12:54 -03:00
DeltaFire e0b2156142 fixes fixes fixes 2020-11-14 19:26:54 +01:00
SandPoot 273ad286d5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-10 14:43:38 -03:00
siliconsGitHubLetter NPutnam3145
 		19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
Enric Gabriel d85ebed8db Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-16 16:22:36 -03:00
siliconsandGitHub ca8b13b86a Merge pull request #13255 from timothyteakettle/limbs 
you can choose limbs to be prosthetic/amputated
 2020-09-16 00:31:18 -07:00
Enric Gabriel 0b427c9f6f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-15 23:32:38 -03:00
DeltaFire 2d8655d712 plushie shapeshifter 2020-09-13 03:25:43 +02:00
Enric Gabriel 1ddcd7669e yes 2020-09-07 16:23:13 -03:00
timothyteakettle cd7293a9a2 limbs 2020-08-24 03:19:36 +01:00
timothyteakettle 46a464d3b8 no it also cant be sentient 2020-08-19 02:26:08 +01:00
timothyteakettle 097851cbc4 better name 2020-08-19 02:11:08 +01:00
timothyteakettle 98baa09005 the aforementioned pet changes 2020-08-19 01:47:11 +01:00
Timothy Teakettle 19dce2263d that too 2020-08-18 17:49:01 +01:00
Timothy Teakettle 945ac02152 small error 2020-08-18 17:48:10 +01:00
Timothy Teakettle 6392367df4 donator items 2020-08-18 17:28:09 +01:00
Timothy Teakettle 75c962ef7b handle removal 2020-07-12 20:18:49 +01:00
Timothy Teakettle c3d490a803 very cool 2020-07-12 20:15:57 +01:00
Timothy Teakettle d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
Chayse RamsayGitHubChangelogs
 		f95222fee0 For the stranger there among them had a big iron on his hip. Big iron on his hiiiiiiip. (#12155) 
* HoS modular revolver, ported from vore

* Bugfixing, sanity checks etc.

* Update hos.dm

* Sprite fixed

* Automatic changelog compile [ci skip]

* HoS Weapon Selection

* Icons

* Clamp fix, removing rogue items from ye olde list

* Update ammo.dmi

* Requested Changes Part 1

* Beacon fixed (kind of)

* Subtypes fix

* User

* Giving process_chamber a user so that the proc can use to_chat without requiring loc, fixes switching so the gun only switches to the same type when empty

* redundant item

* Adds an examine notice on how to remove the magazine

* Requested Changes

* Icons

Co-authored-by: Changelogs <action@github.com>
 2020-05-30 03:17:56 +02:00
Putnam 801956a1f9 Reverts #10352. 2020-05-03 17:44:00 -07:00
Timothy TeakettleandGitHub 62d1a1f734 cook now gets to choose their ingredient box + sushi ingredient box (#11590) 
* Update miscellaneous.dm

* Update cook.dm

* fixes some bugs

* i broke something again and now fix it

* fixes remote, edits ingredient box contents

* even more wildcard items

who doesn't love eggs, grapes and various kinds of human meat? (skeleton meat is a thing for some reason, and thus it goes. IN THE LIST.)

* removes a random newline

* adds a newline to the end of the file i accidentally removed

* why was there a newline here too
 2020-03-24 20:39:46 +01:00
Ghommie 86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Ghommie a817bd6115 Porting the musician and curator beacons. 2020-03-07 00:12:50 +01:00
Seris02 714f76c8aa more changes 2019-12-30 18:48:29 +08:00
kevinz000andGitHub 3254fcf535 goddamnit_again (#2511) 2017-08-26 18:43:57 -07:00
kevinz000andGitHub c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460) 
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
 2017-08-24 21:07:58 -07:00