 Lin
|
36a94c97e0
|
Merge pull request #13802 from Citadel-Station-13/silicons-patch-29
bandaid fixes meteors not spawning properly due to off by 1 error with zlevel transition
|
2020-12-20 18:27:47 +00:00 |
|
|
Lin
|
3ad777f8f7
|
Merge pull request #13755 from silicons/colormates
ports colormates from rp/vorestation
|
2020-12-20 18:14:48 +00:00 |
|
|
silicons
|
11aad4e6db
|
Merge pull request #13801 from SandPoot/master
Makes limb grower better
|
2020-12-20 10:34:21 -07:00 |
|
|
silicons
|
34f6697e81
|
Merge pull request #13796 from keronshb/fixedscarpchanges
Scarp Changes and Bundle
|
2020-12-20 09:23:20 -07:00 |
|
|
Putnam
|
d47dcc941c
|
Polycircuit sanity checking
|
2020-12-17 22:54:52 -08:00 |
|
|
silicons
|
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 |
|
|
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 |
|
|
DeltaFire
|
3bd1965c7d
|
Merge pull request #13769 from MrJWhit/goose-bar-sign
Adds goose bar sign
|
2020-12-14 06:06:03 +01:00 |
|
|
DeltaFire
|
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
|
31beb2dd62
|
Update colormate.dm
|
2020-12-13 06:41:40 -07:00 |
|
|
silicons
|
28a0725bd8
|
Update colormate.dm
|
2020-12-13 06:36:20 -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 |
|
|
silicons
|
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 |
|
|
silicons
|
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 |
|
|
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 |
|
|
Lin
|
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 |
|
|
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
|
3cbec856a8
|
Update windowdoor.dm
|
2020-11-19 02:41:55 -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 |
|
|
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 |
|
|
silicons
|
6a7ab4de67
|
Merge pull request #13675 from DeltaFire15/sleeper-ui-fix
Fixes sleeper UI Interactiveness
|
2020-11-17 01:11:01 -07:00 |
|
|
silicons
|
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 |
|
|
silicons
|
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 |
|
|
DeltaFire
|
44a49a7261
|
Merge remote-tracking branch 'upstream/master' into vtec-fixing
|
2020-11-16 04:30:45 +01:00 |
|
|
DeltaFire
|
8f04d7f0d1
|
Merge remote-tracking branch 'upstream/master' into system-corruption
|
2020-11-16 04:29:59 +01:00 |
|
|
DeltaFire
|
185c8929b0
|
Merge remote-tracking branch 'upstream/master' into supplypod-shrapnel
|
2020-11-16 04:29:43 +01:00 |
|
|
SandPoot
|
00adf078b0
|
this is needed
|
2020-11-15 19:13:01 -03:00 |
|
|
SandPoot
|
cbb44674ac
|
fix + renaming global list?
|
2020-11-15 19:10:50 -03:00 |
|
|
DeltaFire
|
e191cd3b5b
|
sleeper ui compartibility
ugly but less work & less ugly than completely rewriting it.
If anyone else wants to, be my guest.
|
2020-11-15 20:47:22 +01:00 |
|
|
SandPoot
|
936bda44db
|
upload gift.dm
|
2020-11-14 20:38:23 -03:00 |
|