Commit Graph
9060 Commits
Author SHA1 Message Date
Putnam 6f0075e606 Made minor roundstarts actually work. 2020-12-17 22:44:35 -08:00
silicons ebd6e0cbec no backapck in backpack 2020-12-17 04:14:04 -07:00
siliconsandGitHub 50eee24a4a Update meteors.dm 2020-12-16 18:22:49 -07:00
SandPoot 3ea756a062 typo and remove badword 2020-12-16 11:43:40 -03:00
SandPoot a0ae0c37fe upload files 2020-12-16 11:39:50 -03:00
Putnam bdd5fc777f Added an indicator of how many iterations were done. 2020-12-15 19:14:15 -08:00
keronshb 3d7c896100 Scarp Changes and Bundle
This should really fix it now.
2020-12-15 20:10:21 -05:00
silicons a7aa7f2466 delete pdas 2020-12-15 07:43:35 -07:00
silicons e87cc27803 modifications 2020-12-15 07:21:06 -07:00
Putnam 7adc97027a oop 2020-12-14 22:18:27 -08:00
Putnam 917c230ae2 Makes grab bag ONLY make station antags. 2020-12-14 18:14:03 -08:00
MrJWhit 53d41ea190 Update mines.dm 2020-12-14 15:57:57 -05:00
silicons b34f5d56f6 Merge remote-tracking branch 'citadel/master' into respawn_system_2 2020-12-13 22:54:16 -07:00
DeltaFireandGitHub 3bd1965c7d Merge pull request #13769 from MrJWhit/goose-bar-sign
Adds goose bar sign
2020-12-14 06:06:03 +01:00
DeltaFireandGitHub 4437b28b34 Merge pull request #13751 from Citadel-Station-13/silicons-patch-13
standardizes text formatting to rp server's |one character| instead of ||two|| because why did i even do the latter
2020-12-14 05:50:51 +01:00
silicons 4451a96997 fixes 2020-12-13 20:12:14 -07:00
siliconsandGitHub 31beb2dd62 Update colormate.dm 2020-12-13 06:41:40 -07:00
siliconsandGitHub 28a0725bd8 Update colormate.dm 2020-12-13 06:36:20 -07:00
silicons 99709a1a35 fix 2020-12-13 04:30:00 -07:00
silicons 5c830d4d44 Merge remote-tracking branch 'citadel/master' into respawn_system_2 2020-12-13 02:34:57 -07:00
silicons a4688557d7 Cryo 2020-12-13 02:29:31 -07:00
MrJWhit f5b99b83f8 Fully functional 2020-12-13 02:29:29 -05:00
MrJWhit 939d6b7ad8 goose barsign 2020-12-13 00:57:05 -05:00
siliconsandGitHub 0d63fc9cf4 Update shuttles.dm 2020-12-12 19:02:56 -07:00
silicons 4b20d26d2b Merge remote-tracking branch 'citadel/master' into colormates 2020-12-12 01:56:37 -07:00
silicons 60f9e97ce5 test 2020-12-11 17:31:27 -07:00
silicons e27c843296 fixes 2020-12-11 05:35:57 -07:00
silicons c70d7a24e0 fixes 2020-12-11 05:14:38 -07:00
silicons 13391d2af6 fix 2020-12-11 05:09:29 -07:00
silicons 599a1f0419 fix 2020-12-11 05:06:44 -07:00
silicons 76e7caad33 colormates 2020-12-11 04:54:30 -07:00
siliconsandGitHub 3891095a21 Update say.dm 2020-12-11 01:58:39 -07:00
Linzolle 0ddc053a8b what if mapmerge worked 2020-12-08 17:35:21 -06:00
Linzolle 3e951d334c fix entertainment monitors 2020-12-08 17:21:14 -06:00
DeltaFire 69a1d6e603 oop 2020-12-08 16:32:34 +01:00
DeltaFire 86661a4fe0 aaaaaaaaaaaaaa 2020-12-08 16:30:09 +01:00
siliconsandGitHub 8d398b3e24 Merge pull request #13719 from shellspeed1/Adds-construction-bags-from-tg
Ports construction bags and makes it easier to get material bags. (READY)
2020-12-03 16:33:47 -07:00
LinandGitHub a6eeb5d418 Merge pull request #13692 from Citadel-Station-13/silicons-patch-7
fixes windoor spraycanning
2020-12-03 20:34:16 +00:00
shellspeed1 3735efbfca Ports construction bags 2020-11-29 18:29:03 -08:00
siliconsandGitHub 75d807df4e Merge pull request #13694 from TheObserver-sys/PublicMiningRevival
Local Assistant man can now bash rock again!*
2020-11-21 18:25:13 -07:00
siliconsandGitHub 3cbec856a8 Update windowdoor.dm 2020-11-19 02:41:55 -07:00
siliconsandGitHub f8d43b7544 Merge pull request #13679 from DeltaFire15/system-corruption
[TESTMERGE ONLY] System Corruption for robotic species
2020-11-18 22:54:51 -07:00
Putnam3145andGitHub cd3b3e52ea Merge pull request #13662 from Citadel-Station-13/silicons-patch-3
re-allows angel species on magic mirrors
2020-11-18 17:51:02 -08:00
Putnam3145andGitHub 9d300ade35 Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
The0bserver 6d1ace27f7 Initial Commit: Mapping is painful 2020-11-18 00:38:35 -05:00
siliconsandGitHub 891d4ec76e Merge pull request #13681 from DeltaFire15/supplypod-shrapnel
Fixes a bunch of supplypod related stuff
2020-11-17 01:12:56 -07:00
siliconsandGitHub 6a7ab4de67 Merge pull request #13675 from DeltaFire15/sleeper-ui-fix
Fixes sleeper UI Interactiveness
2020-11-17 01:11:01 -07:00
siliconsandGitHub f11b636727 Merge pull request #13674 from DeltaFire15/vtec-fixing
The borg VTEC ability no longer persists after the upgrade is removed
2020-11-17 01:10:53 -07:00
siliconsandGitHub a950bcb0fb Merge pull request #13644 from DeltaFire15/hybrid-limbs-wound-stuff
[READY] Hybrid bodyparts - wound surgery edition
2020-11-17 01:09:47 -07:00
DeltaFire c8719e18d8 Merge remote-tracking branch 'upstream/master' into sleeper-ui-fix 2020-11-16 04:31:02 +01:00