Commit Graph

704 Commits

Author SHA1 Message Date
keronshb 78db6bd5c2 Ports Floor Cluwnes
Oh fuck oh god
2021-05-26 21:58:35 -04:00
zerothebigboy bd186d25cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 2021-05-23 15:29:20 -04:00
silicons 780a579c7b Update SDQL_2_wrappers.dm 2021-05-17 12:20:15 -07:00
Putnam 6c8fa56132 Adds make priority announcement verb 2021-05-06 15:10:36 -07:00
zerothebigboy 359c778955 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	code/modules/ninja/suit/ninjaDrainAct.dm
2021-05-02 22:47:39 -04:00
SandPoot 90661d3687 upload files 2021-04-24 21:37:01 -03:00
SandPoot 5bb6078def upload files 2021-04-22 20:39:21 -03:00
silicons 75e3f5eae6 Merge pull request #14573 from zeroisthebiggay/eatshitanddie
pov: you're an enraged miner main that hates having their loot require a modicum of effort (ports tg ash drake)
2021-04-21 13:50:46 -06:00
silicons cbd7e0de6a Merge pull request #14418 from LetterN/perlin-genny
Updates openspace & enables perlin generation on alvaland & icebox/snaxi
2021-04-06 04:10:00 -06:00
zerothebigboy f1b45b3839 eatshitanddie 2021-04-05 21:55:17 -04:00
Blue Wildrose 3d8f8ffe27 Bringin' back the ding 2021-04-02 02:19:19 -07:00
zerothebigboy 01d92230a3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	icons/mob/clothing/mask.dmi
2021-03-16 19:19:12 -04:00
Letter N 935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
Letter N a87e4533e5 support for tgs4 noconfigs needed*** 2021-03-03 17:33:14 +08:00
Letter N 754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Letter N 7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N 501d33cddd agony 2021-02-19 10:32:24 +08:00
Letter N de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Letter N 8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
zerothebigboy 85886f563f f 2021-02-08 16:59:54 -05:00
Letter N f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
Timothy Teakettle 938b924a37 yes 2021-01-28 11:12:27 +00:00
Timothy Teakettle 8569c40ce5 Update adminpm.dm 2021-01-21 22:23:48 +00:00
Timothy Teakettle 401e6a7690 test 2021-01-21 20:17:25 +00:00
Letter N 125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
silicons e680d58a03 fixes 2021-01-09 14:56:29 -08:00
silicons ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
Artur 9e16df56aa Ding for prayers 2021-01-04 23:23:55 +02:00
Letter N cd5d558fad safety? what's that?
* maybe table-breaking change
2021-01-04 11:57:12 +08:00
Letter N 56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
DeltaFire c37bb9cc2a Merge pull request #13842 from Citadel-Station-13/silicons-patch-35
deletes a tiny segment of dead code
2020-12-22 17:56:13 +01:00
DeltaFire 65c14cf289 Merge pull request #13537 from silicons/permissions
support update for event manager permissions
2020-12-22 16:12:03 +01:00
silicons 458f0e4491 Update deadsay.dm 2020-12-21 21:51:52 -07:00
uomo91 cfaa988217 Merge master and fix newline conflict. 2020-11-19 17:12:19 -06:00
Putnam3145 9d300ade35 Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
uomo91 6b85ab5c01 Individual logging code. 2020-11-16 01:40:48 -06:00
DeltaFire 3e19557e8f and more fixes. 2020-11-14 19:38:39 +01:00
silicons 803bff4e5f funny 2020-11-12 23:34:42 -07:00
silicons 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
silicons 8e83dcd697 event permissions 2020-10-07 14:43:53 -07:00
Letter N 47845f2c30 suposed to be SSupdates but noo 2020-10-03 19:54:23 +08:00
silicons 8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
Timothy Teakettle 58737e42b9 empulse using range 2020-09-10 19:52:34 +01:00
timothyteakettle e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
Artur c79e9fbc0b https://github.com/tgstation/tgstation/pull/53263 2020-09-02 18:48:09 +03:00
Artur 3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
Letter N 57a008d567 fixes adminbus 2020-08-26 11:22:57 +08:00
Letter N c13a22a841 stops kevinz from leaking his IP 2020-08-24 18:42:48 +08:00
Letter N b8d812fb47 "what if adminbus stops leaking confidential adminchat" and also updates admin things. you can now do obj/structure/singulo:50 2020-08-23 17:18:32 +08:00
Letter N 271c66ad40 travis moment 2020-08-22 17:03:10 +08:00