260a140f97
Ports instruments from /VG/station, including harmonicas, xylophones, saxophones, trombones, and a BIKE HORN. Repaths instruments to sound/instruments. Also, allows piano synth to play all instruments but eguitar and gives cargo a crate with everything. Clown gets the bike horn trumpet at roundstart. ( #2034 )
2017-07-17 00:52:43 -07:00
44742cb115
im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" ( #2025 )
...
* Revert "Automatic changelog generation for PR #2021 [ci skip]"
This reverts commit 9d0cd37dd3#2021 )"
This reverts commit f2ac487927
2017-07-15 11:41:36 -07:00
f2ac487927
Disease Refactor ( #2021 )
2017-07-15 11:40:49 -07:00
2d3905457e
[MIRROR] Rename Bump to Collide ( #2002 )
...
* Rename Bump to Collide
* Delete bubblegum.dm.rej
* Update bubblegum.dm
2017-07-14 21:35:56 -07:00
6d3123f63c
Readds borers ( #1999 )
...
Readds the cortical borers and also syndi-borers.
Syndi-borers now gives a response if you try to use it multiple times
too quickly, and also prevents usage more than once while it's still
waiting for ghost responses.
2017-07-14 19:28:52 -07:00
55462ed7d1
Replaces ex_act and emp_act numbers with defines
2017-07-13 17:46:41 -05:00
f893863397
[MIRROR] Refactors speech/communication logging and adds coordinates to speech logs ( #1905 )
...
* Refactors speech/communication logging and adds coordinates to speech logs
* Update clockwork_slab.dm
* Delete clockwork_slab.dm.rej
* Update browserOutput.dm
* Delete browserOutput.dm.rej
2017-07-13 06:37:51 -07:00
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
b42fb13549
Adds Headphones!
2017-07-07 12:44:47 -05:00
998a75bc89
Makes martial arts not be deleted ( #1931 )
2017-07-07 10:35:40 -07:00
dd70580a72
Merge pull request #1901 from Citadel-Station-13/upstream-merge-28992
...
[MIRROR] Adds Necropolis curses for cursed items in Necropolis ruins
2017-07-06 11:22:24 -05:00
4796ede787
Adds Necropolis curses for cursed items in Necropolis ruins
2017-07-06 10:15:09 -05:00
9c5b764058
Makes pulsing the AI wire of a borg offer the user the option to change it and properly notifies the AI when it is cut.
2017-07-06 09:53:35 -05:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
5882b25b7a
Rewrites Recollection and splits it into categories, rewords Hierophant Network description
2017-07-03 10:10:17 -05:00
8627946f72
Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being qdel'd more than once ( #1753 )
2017-06-30 21:22:45 -07:00
0c9b72f7fc
Fixes pimpin ride janicart (and other ridden vehicles) being spaceworthy ( #1707 )
2017-06-30 20:57:27 -07:00
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
28cd2d6164
Merge pull request #1783 from Citadel-Station-13/upstream-merge-28644
...
[MIRROR] Ninja Dash
2017-06-26 10:09:16 -05:00
028752c3de
Merge pull request #1777 from Citadel-Station-13/upstream-merge-28564
...
[MIRROR] Shuttle engines affecting travel time
2017-06-26 09:00:54 -05:00
5cf2065432
Ninja Dash
2017-06-26 08:57:46 -05:00
e3b1838e63
Merge pull request #1697 from Citadel-Station-13/upstream-merge-28600
...
[MIRROR] Adds a heavily-damaged ripley as a lavaland ruin
2017-06-26 06:24:31 -05:00
5571cca37c
.rej cleanup
2017-06-26 06:14:42 -05:00
1a38b6fd6f
Shuttle engines affecting travel time
2017-06-25 20:53:00 -05:00
d4c54bb0b5
Ancient Space Station [Space Spawn Ruin]
2017-06-25 11:03:27 -05:00
d04001c09d
another huge sync
2017-06-21 18:00:00 -05:00
50a4f61663
Adds a heavily-damaged ripley as a lavaland ruin
2017-06-20 12:09:15 -05:00
42368581c5
Merge branch 'master' into upstream-merge-26965
2017-06-19 15:39:01 -05:00
66b02755cb
Fixes testmerge display ( #1644 )
2017-06-17 13:15:21 -07:00
12d9e0f66f
Merge pull request #1638 from Citadel-Station-13/upstream-merge-28510
...
[MIRROR] Allows fine control over rider/passenger direction in vehicles
2017-06-17 10:05:52 -05:00
67db8fc9ad
Merge pull request #1630 from Citadel-Station-13/upstream-merge-28492
...
[MIRROR] Vomit fix
2017-06-17 10:03:11 -05:00
df0194c87f
Allows fine control over rider/passenger direction in vehicles
2017-06-17 07:34:18 -05:00
9bd98194b2
Vomit fix
2017-06-16 15:19:26 -05:00
2e9e7f5488
Cultists must be human to run for Cult Master status
2017-06-16 12:53:49 -05:00
ef336bb4ad
Fixes a documentation typo
2017-06-15 20:48:37 -05:00
f0f6341588
Create verbs.dm
2017-06-15 10:06:05 -05:00
4c1b223248
Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
...
Selective mirror sync
2017-06-14 06:41:01 -05:00
5c2acd599e
[MIRROR] HOTFIX: Cult now gets a functioning summon objective ( #1509 )
...
* HOTFIX: Cult now gets a functioning summon objective
* Update datum_cult.dm
* Delete datum_cult.dm.rej
2017-06-13 20:40:49 -07:00
97005222ff
Blood Cult Nerf: Restricted Nar-Sie summoning locations ( #1479 )
2017-06-13 13:48:49 -07:00
5db49fb44b
Last Cult Master Spell: Eldritch Pulse & Various Tweaks ( #1430 )
2017-06-13 13:48:36 -07:00
226345d82a
upstream-merge-28109
...
upstream-merge-28352
2017-06-13 01:10:21 -05:00
2a5be91970
compile fixes
2017-06-12 16:12:00 -05:00
55d30f865b
upstream-merge-28062
2017-06-12 12:20:07 -05:00
11ff6a7628
upstream-merge-27971
2017-06-11 08:21:14 -05:00
c760c52817
upstream-merge-27951
2017-06-11 02:11:34 -05:00
4276cdde17
Fixes attacking not breaking chameleon
2017-06-10 12:19:39 -05:00
eac4854adf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-28165
2017-06-10 09:38:21 -05:00
7fa05ca854
Merge pull request #1489 from Citadel-Station-13/upstream-merge-27960
...
[MIRROR] [READY] Gang Points Refactor - Now stored in the gang datum
2017-06-09 09:37:58 -05:00
1bdda132e7
Adds Medal Commendations!
2017-06-08 20:39:15 -05:00
CitadelStationBot