Commit Graph

26519 Commits

Author SHA1 Message Date
Putnam3145
f1b7c4aea5 Update miscellaneous.dm 2021-01-02 17:30:06 -08:00
Lin
b3c1c69861 Merge pull request #13944 from Citadel-Station-13/silicons-patch-59
fixes matrix labels on colormates (swapped 1 and 2, rg is actually gr)
2021-01-02 16:17:24 +00:00
Blue Wildrose
642c4a5806 erect up the config instead in case this situation comes up again. 2021-01-02 00:18:49 -07:00
EmeraldSundisk
291c0a0a22 Update Space_Station_13_areas.dm 2021-01-01 22:46:36 -08:00
Blue Wildrose
843b1494b3 max penis size increased before being punished for having one 2021-01-01 23:01:39 -07:00
Timothy Teakettle
dc44102d8b fix 2021-01-01 22:39:16 +00:00
Timothy Teakettle
974f46cb22 attempt to fix 2021-01-01 22:36:35 +00:00
Timothy Teakettle
813e0f4c79 Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items 2021-01-01 22:30:04 +00:00
silicons
190fcb312b Update mobs.dm 2021-01-01 12:24:46 -07:00
necromanceranne
6a247e2a68 Adds a new version of bokken, cleans up some unnecessary code, completely redoes several bokken related sprites 2021-01-02 04:26:39 +11:00
silicons
78322199e3 fix 2021-01-01 00:38:46 -08:00
Chiirno
da5ea18c9a OK, compiling did something funky to the dm code? 2021-01-01 04:04:39 -04:00
Chiirno
bbeed2b8f0 I've done it, I've edited TgUI! 2021-01-01 04:00:35 -04:00
DeltaFire
a2bb761bee Merge pull request #13924 from SandPoot/master
Allows mass sticking money into your id
2021-01-01 08:15:53 +01:00
DeltaFire
ee6601276d Merge pull request #13935 from Citadel-Station-13/silicons-patch-58
fixes a bug
2021-01-01 08:11:40 +01:00
uomo91
6b0435e7b5 Port. 2021-01-01 00:46:47 -06:00
DeltaFire
2ed866d855 boom 2021-01-01 07:22:10 +01:00
silicons
fbb2cfbba1 Update colormate.dm 2020-12-31 23:05:14 -07:00
Hatterhat
e63e0ac9bd something about wardrobes 2020-12-31 22:03:09 -06:00
YakumoChen
9325daa743 Update powersink.dm 2021-01-01 03:35:54 +00:00
DeltaFire
38565e0027 Merge pull request #13909 from silicons/twitch_plays
Twitch Plays: Clown Car
2021-01-01 04:14:26 +01:00
Chiirno
218cac1a49 OK, chem mixer has been added to a tech node now. 2020-12-31 22:19:51 -04:00
Chiirno
6f5837d14f changed the description of the crate. 2020-12-31 17:42:07 -04:00
Chiirno
d936b43e98 adjusted the price to 1975. Above eva suit at 1500 and beow medical hardsuit at 2750 2020-12-31 17:27:25 -04:00
Chiirno
7d0c4030c9 first commit, adding the paramed eva suit as an option for cargo. 2020-12-31 17:24:30 -04:00
silicons
8a471d6984 logs 2020-12-31 12:35:45 -08:00
silicons
1a027c2fa2 good catch 2020-12-31 13:34:47 -07:00
silicons
251bd3e06b logging 2020-12-31 12:33:05 -08:00
SandPoot
a0e95b7c3d Update code/modules/mining/ores_coins.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2020-12-31 16:59:33 -03:00
silicons
f1205efa0f Merge pull request #13885 from raspy-on-osu/spaceheater-buff
Makes space heaters worth using
2020-12-31 12:38:07 -07:00
Timothy Teakettle
3cde6799f7 define 2020-12-31 19:02:03 +00:00
Timothy Teakettle
166176f3ec synthetic anthromorph species 2020-12-31 19:01:04 +00:00
necromanceranne
0aa5338f9b Adds wakibokken, puts bokken crafting into the craft menu, makes proper bokken a little harder to make but obviously an upgrade, makes crafted katanas and bokken have actual belt overlays 2021-01-01 05:42:28 +11:00
DeltaFire
c699113061 Merge pull request #13928 from Citadel-Station-13/silicons-patch-57
while we're at it let's make holoparasites not carry radiation either thanks @lbd
2020-12-31 19:01:12 +01:00
Blue Wildrose
0e5b2c60ee Fixes loadout specific polychromic hoodies 2020-12-31 03:42:29 -07:00
silicons
9c0762f35a Update say_vr.dm 2020-12-31 03:41:55 -07:00
shellspeed1
45ce0a72a1 Ports bluespace navigation gigabeaconon
port of https://github.com/tgstation/tgstation/pull/44807
2020-12-31 01:49:38 -08:00
shellspeed1
f02a6cf68b Space 2020-12-31 01:18:30 -08:00
shellspeed1
949aab2a4a extra desc 2020-12-31 01:07:24 -08:00
shellspeed1
3462f3d114 Changes some descriptions. Port of https://github.com/BeeStation/BeeStation-Hornet/pull/3144 2020-12-31 00:43:05 -08:00
shellspeed1
b69132bede ports https://github.com/tgstation/tgstation/pull/52931 2020-12-31 00:34:44 -08:00
silicons
34256a61ef remove drips 2020-12-30 21:06:34 -08:00
silicons
bfa66b2810 Merge pull request #13926 from MrJWhit/revert-kevins-shame
Revert kevinzs' shame
2020-12-30 14:48:49 -07:00
DeltaFire
62a238e556 Merge pull request #13927 from Citadel-Station-13/silicons-patch-56
FUCK OFF WHY IS VORE SHITCODE CAUSING CHERNOBYL AGAIN I HATE VORE CODE
2020-12-30 22:46:36 +01:00
silicons
1b9a399bbd Merge pull request #13905 from zeroisthebiggay/help
gives codex cicatrix inhands
2020-12-30 14:46:26 -07:00
silicons
3ad65d9b76 Merge pull request #13911 from raspy-on-osu/salicyclic-acid
salicyclic acid
2020-12-30 14:46:04 -07:00
silicons
e91b3b7a81 Merge pull request #13916 from timothyteakettle/better-holoforms
reverts the removal of the holoform verb because kevin likes it
2020-12-30 14:45:23 -07:00
silicons
813471dbbb Merge pull request #13914 from EmeraldSundisk/cog2020
Some area designation fixes for CogStation.
2020-12-30 14:44:52 -07:00
silicons
667651aebb Merge pull request #13915 from Xantholne/Birdsitfix
Fixes new bird sprites defaulting to basic parrot when sitting
2020-12-30 14:44:28 -07:00
silicons
a9d831d10d Update guardian.dm 2020-12-30 14:36:39 -07:00