Commit Graph

6523 Commits

Author SHA1 Message Date
Timothy Teakettle
c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
silicons
9f130e0c5a blood 2020-12-26 14:09:10 -08:00
silicons
5c0b4f824f hoh boy 2020-12-26 12:42:03 -08:00
silicons
45af2360ad changes 2020-12-26 11:35:47 -08:00
raspy-on-osu
0e652cb64c init 2020-12-26 06:02:09 -05:00
Letter N
1095142a5f Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-26 10:58:12 +08:00
silicons
5cf717e75d self message 2020-12-25 16:10:32 -08:00
silicons
5e66e4509f wew 2020-12-25 16:07:17 -08:00
Letter N
56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
silicons
bff30f587b sigh 2020-12-23 09:16:16 -07:00
zeroisthebiggay
3f36b95f92 a
a
2020-12-23 09:42:10 -05:00
Letter N
e9ca58446c Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-23 12:25:24 +08:00
DeltaFire
7da2f871d0 corrects comment 2020-12-23 03:02:42 +01:00
DeltaFire
8a5cdddb67 actually increases brass welder refueling speed 2020-12-23 02:57:01 +01:00
Chiirno
35896e92ec Paramedic office added and operating room remodeled 2020-12-22 21:50:22 -04:00
DeltaFire
4d4d0e9ec3 a fix fix 2020-12-23 02:50:15 +01:00
DeltaFire
bdbe1bc404 Merge pull request #13829 from silicons/keyloop
Bandaid fix for input controller lockup due to sleeping
2020-12-22 06:00:29 +01:00
zerothebigboy
dcecd6f03a pogbox 2020-12-21 18:28:52 -05:00
zerothebigboy
cca8dc3a36 pogbox 2020-12-21 18:25:33 -05:00
silicons
901fcddf44 Merge pull request #13819 from Hatterhat/surv-dag-buf
survival dagger light fix + butchery buff
2020-12-21 10:30:13 -07:00
silicons
0e7a597a2b alright 2020-12-21 10:27:28 -07:00
Letter N
abd94d1c03 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-21 21:19:06 +08:00
Letter N
98ff0a080e ImmursionAudio(TM) 2020-12-21 19:47:11 +08:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
DeltaFire
8414db5add Merge pull request #13814 from Xantholne/TwinSwordSheath
Fixes twin sword sheaths icon/item state from being blank sprites
2020-12-21 02:20:32 +01:00
Xantholne
1c968e6ebe period equals 2020-12-20 16:00:18 -07:00
Lin
3ad777f8f7 Merge pull request #13755 from silicons/colormates
ports colormates from rp/vorestation
2020-12-20 18:14:48 +00:00
silicons
34f6697e81 Merge pull request #13796 from keronshb/fixedscarpchanges
Scarp Changes and Bundle
2020-12-20 09:23:20 -07:00
Hatterhat
fa799a0ac5 it compiles 2020-12-19 19:02:56 -06:00
Hatterhat
b8b2f34735 funny knife 2020-12-19 18:45:25 -06:00
Xantholne
a5c14b90c5 Adds missing sheathing sounds 2020-12-18 22:56:30 -07:00
Xantholne
d60d72c7b7 Fixes twin belts
gives item state and icon state to be functional
2020-12-18 22:03:24 -07:00
Putnam
d47dcc941c Polycircuit sanity checking 2020-12-17 22:54:52 -08:00
keronshb
3d7c896100 Scarp Changes and Bundle
This should really fix it now.
2020-12-15 20:10:21 -05:00
MrJWhit
53d41ea190 Update mines.dm 2020-12-14 15:57:57 -05:00
Letter N
cf692e8426 subsystem upgrades 2020-12-14 15:28:59 +08:00
DeltaFire
3bd1965c7d Merge pull request #13769 from MrJWhit/goose-bar-sign
Adds goose bar sign
2020-12-14 06:06:03 +01: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
silicons
c70d7a24e0 fixes 2020-12-11 05:14:38 -07:00
silicons
13391d2af6 fix 2020-12-11 05:09:29 -07:00
silicons
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
shellspeed1
3735efbfca Ports construction bags 2020-11-29 18:29:03 -08:00
silicons
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
silicons
f8d43b7544 Merge pull request #13679 from DeltaFire15/system-corruption
[TESTMERGE ONLY] System Corruption for robotic species
2020-11-18 22:54:51 -07:00
Putnam3145
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
Putnam3145
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
Putnam
30fb673670 Superconductivity is gone. Only rustmos now. 2020-11-17 02:35:10 -08:00
silicons
891d4ec76e Merge pull request #13681 from DeltaFire15/supplypod-shrapnel
Fixes a bunch of supplypod related stuff
2020-11-17 01:12:56 -07:00