CitadelStationBot
4dd0dc9d66
[MIRROR] Various grammar fixes ( #2842 )
...
* Various grammar fixes
* Update mecha_parts.dm
* Update crates.dm
* Update ghost_role_spawners.dm
* Update paper_premade.dm
* Update oldstation.dm
2017-09-17 22:35:51 -05:00
Leo
cb734046f7
Changes golem shell attackby istype chain to use an assoc list instead of an istype chain ( #30542 )
...
* Changes golem shell attackby istype chain to use an assoc list instead
* Makes the check use merge_type as opposed of item type
2017-09-10 14:18:25 -05:00
Robustin
8010c44c72
Golem shells can no longer fit in bags ( #30498 )
...
* Automatic changelog generation for PR #30056 [ci skip]
* RIP pocket army
* Delete AutoChangeLog-pr-30056.yml
2017-09-08 13:53:00 -05:00
ShizCalev
849deb5e4e
Cleans up more paper fluff varedits. ( #30418 )
2017-09-06 18:42:43 -05:00
kevinz000
5591afc9ce
double wew
2017-08-29 09:53:11 -07:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
47596fadfc
Makes boss tiles immune to the oldest boss, Lord Singuloth ( #2465 )
2017-08-24 18:27:29 -07:00
kevinz000
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
CitadelStationBot
b5e7f7f7fe
[MIRROR] Adds defines for mouse_opacity ( #2381 )
...
* Adds defines for mouse_opacity
* Delete misc.dm.rej
* Update misc.dm
2017-08-21 20:29:37 -07:00
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
CitadelStationBot
deffc1b1f1
More baseturf helpers
2017-08-13 01:28:20 -05:00
CitadelStationBot
76f7fcef9a
[MIRROR] Cleaned up paper varedits + tidied up paths ( #2156 )
...
* Cleaned up paper varedits + tidied up paths
* work smarter, not harder
* citadel snowflake
* Update uplink_item_cit.dm
2017-08-02 03:17:32 -05:00
CitadelStationBot
3d53f888b1
Improves several Sound Loops' Performance
2017-07-31 14:35:16 -05:00
CitadelStationBot
147bd4cf97
Lava is no longer a plating subtype ( #2138 )
2017-07-26 00:05:53 -07:00
LetterJay
27b826a6f1
Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260
...
[MIRROR] Changes all access const to be a define
2017-07-19 13:18:58 -05:00
CitadelStationBot
bbc28aa856
Energy swords and other transforming energy weapons are now subtypes of transforming weapons ( #2049 )
2017-07-17 22:51:51 -07:00
CitadelStationBot
609ae007ae
Changes all access const to be a define
2017-07-16 11:44:47 -05:00
CitadelStationBot
1da785ffb5
Removes old height parameter from CanPass proc
2017-07-13 17:46:36 -05:00
CitadelStationBot
2892a3710d
[MIRROR] Adds collapsing stone tiles ( #1933 )
...
* Adds collapsing stone tiles
* Update necropolis_gate.dm
* Update necropolis_gate.dm.rej
* Delete necropolis_gate.dm.rej
2017-07-13 06:38:07 -07:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07: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
CitadelStationBot
24e0c88263
Removes the hot variants of necropolis tiles and walls ( #1885 )
2017-07-06 13:20:38 -05:00
CitadelStationBot
431d8050aa
Fixes the legion door admin report/logging
2017-07-06 08:26:19 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
ac33b9defb
Adds some neat tiles and walls for use on lavaland
2017-06-26 09:19:17 -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
815c4500bc
Delete lavaland_ruin_code.dm.rej
2017-06-14 08:27:05 -05:00
LetterJay
9d747590a0
Create lavaland_ruin_code.dm
2017-06-14 08:26:14 -05:00
LetterJay
4c1b223248
Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
...
Selective mirror sync
2017-06-14 06:41:01 -05:00
CitadelStationBot
8157797dff
Fixes #28175 : Adds a light to the ash walker nest. ( #1477 )
2017-06-13 13:46:58 -07:00
LetterJay
bd4d42a8a6
upstream-merge-28034/compile fix/upstream-merge-28048
2017-06-11 08:12:27 -05:00
LetterJay
9d85cbf3b5
upstream-merge-28006
2017-06-11 02:19:56 -05:00
CitadelStationBot
f03aa5e0fa
Adds some more syndicate equipment.
2017-06-05 13:50:54 -05:00
LetterJay
5073d8e6f2
rej
2017-05-30 16:43:09 -05:00
LetterJay
c3a243106f
wew
2017-05-30 16:42:56 -05:00
CitadelStationBot
e02290bf2b
Replaced mob spawner vars with outfits
2017-05-23 07:57:42 -05:00
CitadelStationBot
76c6a54d7e
Gives lavaland syndicates the syndicate faction.
2017-05-18 16:37:57 -05:00
CitadelStationBot
ff9928fdd7
[MIRROR] Makes it clear whether (in)complete golem shells are free or servant ( #857 )
...
* Makes it clear whether (in)complete golem shells are free or servant
* resolves rej file
2017-05-18 04:40:12 -05:00
CitadelStationBot
226fdf9040
Remaps seed vault, adds bees and changes cherry to cherry bomb in random seed spawn ( #973 )
2017-05-14 20:12:00 -07:00
CitadelStationBot
faf8829d30
[MIRROR] Adamantine golem leadership ( #785 )
...
* Adamantine golem leadership
* Update stylesheet.dm
* Delete golems.dm.rej
* Delete stylesheet.dm.rej
* Update golems.dm
* fuck line endings
2017-05-08 22:16:09 -07:00
CitadelStationBot
a6cb12b84a
[MIRROR] Plastic golems ( #806 )
...
* Plastic golems
* Update lavaland_ruin_code.dm
* Delete lavaland_ruin_code.dm.rej
2017-05-08 00:25:20 -07:00
kevinz000
9ca8b570b2
Merge branch 'master' into upstream-merge-26705
2017-05-07 22:53:14 -07:00
kevinz000
52a8aacd00
Delete lavaland_ruin_code.dm.rej
2017-05-07 22:52:47 -07:00
kevinz000
204a3a3938
Update lavaland_ruin_code.dm
2017-05-07 22:52:39 -07:00
LetterJay
b57a4aa6b4
Merge branch 'master' into upstream-merge-26386
2017-05-01 15:27:25 -05:00
