CitadelStationBot
|
90c2a4f867
|
Removes now-unnecessary obj_integrity definitions
|
2017-07-09 19:44:48 -05:00 |
|
LetterJay
|
c5c66777ab
|
Merge pull request #1948 from Citadel-Station-13/upstream-merge-29114
[MIRROR] Fixes plasma glass merging with normal glass
|
2017-07-08 14:33:41 -05:00 |
|
CitadelStationBot
|
2d84e09851
|
Fixes plasma glass merging with normal glass
|
2017-07-08 09:45:46 -05:00 |
|
CitadelStationBot
|
7dd32c4ad9
|
Reinforced Plasma Glass is more SME-worthy
|
2017-07-08 09:44:34 -05:00 |
|
CitadelStationBot
|
9874978c5c
|
Dreams while sleeping are now slightly longer on average and will contain more possibilities (#1940)
|
2017-07-07 23:48:49 -07:00 |
|
CitadelStationBot
|
8525b2129e
|
Windows now have the proper starting health (#1927)
|
2017-07-07 10:34:42 -07:00 |
|
CitadelStationBot
|
2c09a344b7
|
[MIRROR] Fixes windows not returning an Initialize hint (#1902)
* Fixes windows not returning an Initialize hint
* Update window.dm
* Delete window.dm.rej
|
2017-07-06 14:15:30 -05:00 |
|
CitadelStationBot
|
2da7322cca
|
[MIRROR] Gives ghost roles their own assigned_roles (#1887)
* Gives ghost roles their own assigned_roles
* Update ghost_role_spawners.dm
* Delete ghost_role_spawners.dm.rej
|
2017-07-06 14:15:12 -05:00 |
|
LetterJay
|
01611a1c9f
|
Merge pull request #1896 from Citadel-Station-13/upstream-merge-29030
[MIRROR] Removes the need for specifying obj_integrity
|
2017-07-06 10:04:37 -05:00 |
|
LetterJay
|
2acbe52a9d
|
Merge pull request #1893 from Citadel-Station-13/upstream-merge-29050
[MIRROR] Fixes plasma window sprite
|
2017-07-06 10:03:31 -05:00 |
|
CitadelStationBot
|
d859f05d5c
|
Removes the need for specifying obj_integrity
|
2017-07-06 09:24:27 -05:00 |
|
CitadelStationBot
|
44dd423642
|
Fixes plasma window sprite
|
2017-07-06 09:11:55 -05:00 |
|
CitadelStationBot
|
75fe249947
|
Replaces highpressure windows with plasma windows
|
2017-07-06 09:11:50 -05:00 |
|
Poojawa
|
b1b4826c0c
|
July 5th TG sync (#1883)
July 5th TG sync
|
2017-07-05 22:14:19 -05:00 |
|
CitadelStationBot
|
c80d8af7aa
|
[MIRROR] Makes dressers buildable (#1718)
* Makes dressers buildable
* Delete sheet_types.dm.rej
|
2017-06-30 21:26:11 -07:00 |
|
CitadelStationBot
|
9d5e51777b
|
use_power var now uses a define to reflect it not being a bool (#1842)
|
2017-06-30 20:41:59 -07:00 |
|
LetterJay
|
196db74cbe
|
Merge pull request #1714 from Citadel-Station-13/upstream-merge-28588
[MIRROR] Changes to the Atmos Watertank Backpack
|
2017-06-27 22:59:32 -05:00 |
|
LetterJay
|
e680da7de6
|
Merge pull request #1770 from Citadel-Station-13/upstream-merge-28584
[MIRROR] Ancient Space Station [Space Spawn Ruin]
|
2017-06-27 21:25:50 -05:00 |
|
LetterJay
|
090b8b5055
|
Merge pull request #1768 from Citadel-Station-13/upstream-merge-28740
[MIRROR] Station Engineers Spawn With Industrial Welder
|
2017-06-26 10:51:51 -05:00 |
|
CitadelStationBot
|
b16aa00517
|
Small jungle trees
|
2017-06-26 09:42:52 -05:00 |
|
LetterJay
|
ed6c0b042e
|
Merge pull request #1508 from Citadel-Station-13/upstream-merge-28227
[MIRROR] Clown Toy Box + Wooden Crates
|
2017-06-26 04:29:08 -05:00 |
|
CitadelStationBot
|
d4c54bb0b5
|
Ancient Space Station [Space Spawn Ruin]
|
2017-06-25 11:03:27 -05:00 |
|
CitadelStationBot
|
0c2bf7e5ea
|
Station Engineers Spawn With Industrial Welder
|
2017-06-25 09:17:52 -05:00 |
|
Matthew
|
6558f31395
|
Adding Locker reset function
|
2017-06-22 23:53:02 -05:00 |
|
CitadelStationBot
|
d0d1ae1e01
|
Readds sprites for grey & nanotrasen bedsheets
|
2017-06-22 11:03:26 -05:00 |
|
LetterJay
|
d04001c09d
|
another huge sync
|
2017-06-21 18:00:00 -05:00 |
|
CitadelStationBot
|
bac0b96000
|
Changes to the Atmos Watertank Backpack
|
2017-06-20 20:49:11 -05:00 |
|
LetterJay
|
a4c9dc43dd
|
Dufflebag => Dufflebag
|
2017-06-19 16:42:05 -05:00 |
|
CitadelStationBot
|
4be9681e6b
|
Fixes being unable to cremate one thing (#1464)
|
2017-06-17 13:32:54 -07:00 |
|
CitadelStationBot
|
9301af36da
|
Makes RCD ammo use consistent + small speed tweaks (#1646)
|
2017-06-17 13:14:59 -07:00 |
|
CitadelStationBot
|
c97658e39a
|
Knocked-over chairs have materials.
|
2017-06-15 19:48:25 -05:00 |
|
LetterJay
|
d6d1a26376
|
Create ghost_role_spawners.dm
|
2017-06-14 14:28:57 -05:00 |
|
LetterJay
|
df629847bc
|
Create ghost_role_spawners.dm
|
2017-06-14 13:19:00 -05:00 |
|
LetterJay
|
c877fdb501
|
Merge branch 'master' into upstream-merge-28046
|
2017-06-14 13:10:37 -05:00 |
|
LetterJay
|
74e6bc7ee2
|
Merge branch 'master' into SyndicateStuff
|
2017-06-14 11:44:32 -05:00 |
|
LetterJay
|
813bcc2b8d
|
commit
|
2017-06-14 11:16:54 -05:00 |
|
LetterJay
|
7dcb2fa68e
|
Update tables_racks.dm
|
2017-06-14 08:30:25 -05:00 |
|
LetterJay
|
aba07154d0
|
Delete ghost_role_spawners.dm.rej
|
2017-06-14 08:27:11 -05:00 |
|
LetterJay
|
0f966610de
|
Update ghost_role_spawners.dm
|
2017-06-14 08:25:09 -05:00 |
|
LetterJay
|
55d30f865b
|
upstream-merge-28062
|
2017-06-12 12:20:07 -05:00 |
|
LetterJay
|
11ff6a7628
|
upstream-merge-27971
|
2017-06-11 08:21:14 -05:00 |
|
LetterJay
|
bd4d42a8a6
|
upstream-merge-28034/compile fix/upstream-merge-28048
|
2017-06-11 08:12:27 -05:00 |
|
LetterJay
|
e596e3eea4
|
missing files
|
2017-06-11 00:04:13 -05:00 |
|
LetterJay
|
b80a184d97
|
up to upstream-merge-27868
|
2017-06-11 00:04:00 -05:00 |
|
LetterJay
|
522b6d917f
|
updates
|
2017-06-10 09:36:39 -05:00 |
|
LetterJay
|
7189249f66
|
Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115
[MIRROR] A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals)
|
2017-06-10 09:01:25 -05:00 |
|
CitadelStationBot
|
f26cf4e9ef
|
Clown Toy Box + Wooden Crates
|
2017-06-09 11:02:37 -05:00 |
|
LetterJay
|
923c5b9035
|
Merge pull request #1308 from Citadel-Station-13/upstream-merge-27881
[MIRROR] Luxury Bluespace Shelter Capsules, Take 2.
|
2017-06-08 03:35:23 -05:00 |
|
CitadelStationBot
|
e21e4eac9d
|
Adds creamatoriums
|
2017-06-07 20:45:26 -05:00 |
|
CitadelStationBot
|
9725329268
|
A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals)
|
2017-06-07 03:06:15 -05:00 |
|