shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,614 Commits 5 Branches 0 Tags
3ee26917bda67ad76cdeece6562cd88eda50a875
Commit Graph

505 Commits

Author SHA1 Message Date
CitadelStationBot
3ee26917bd Organ Update [Cloning isn't broken edition] 2017-07-14 09:00:36 -05:00
CitadelStationBot
03618e7aa4 Raises max lines for piano from 50 to 300 (#1993) 2017-07-14 03:14:07 -07:00
CitadelStationBot
5e079fa54f Welding tools now use overlays for fuel gauges, rather than icons (#1994) 2017-07-14 03:13:55 -07:00
LetterJay
798050317f Merge pull request #1991 from Citadel-Station-13/upstream-merge-28826 
[MIRROR] Adds a 'nemesis faction' system to transforming weapons
 2017-07-13 23:59:06 -05:00
LetterJay
0c6343c3bc Merge pull request #1990 from Citadel-Station-13/upstream-merge-29197 
[MIRROR] Adds a "synthesizer" that's basically a handheld piano
 2017-07-13 23:58:37 -05:00
LetterJay
9d3c4d4702 Merge pull request #1989 from Citadel-Station-13/upstream-merge-29215 
[MIRROR] Replaces ex_act and emp_act numbers with defines
 2017-07-13 23:57:35 -05:00
CitadelStationBot
92c6b7b445 Adds a 'nemesis faction' system to transforming weapons 2017-07-13 17:46:51 -05:00
CitadelStationBot
b3f8b2a2d7 Adds a "synthesizer" that's basically a handheld piano 2017-07-13 17:46:46 -05:00
CitadelStationBot
55462ed7d1 Replaces ex_act and emp_act numbers with defines 2017-07-13 17:46:41 -05:00
CitadelStationBot
1da785ffb5 Removes old height parameter from CanPass proc 2017-07-13 17:46:36 -05:00
CitadelStationBot
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
CitadelStationBot
85fa3c0bee [MIRROR] Refactors flightsuit code to hopefully be less dumb (#1975) 
* Refactors flightsuit code to hopefully be less dumb

* Update flightsuit.dm

* Delete flightsuit.dm.rej

* Delete objs.dm.rej

* Delete mob_movement.dm.rej

* Delete carbon_movement.dm.rej

* Update mob_movement.dm

* Update flightsuit.dm

* Update mob_movement.dm

* fix
 2017-07-12 05:24:50 -07:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot
1b70c06474 Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs (#1970) 2017-07-10 16:10:42 -07:00
LetterJay
b4eee0a1c4 Merge pull request #1962 from Citadel-Station-13/upstream-merge-29145 
[MIRROR] Updates vending refill packs to reflect additional items added in headphones PR
 2017-07-09 23:06:28 -05:00
LetterJay
ff0c889a29 Merge pull request #1961 from Citadel-Station-13/upstream-merge-29140 
[MIRROR] Removes now-unnecessary obj_integrity definitions
 2017-07-09 23:06:13 -05:00
LetterJay
2a0e31f0f2 Merge pull request #1955 from Citadel-Station-13/upstream-merge-29136 
[MIRROR] Fixes flashbangs stunning for a maximum of 0.3 seconds instead of 6 seconds
 2017-07-09 23:04:45 -05:00
CitadelStationBot
d64469ccda Updates vending refill packs to reflect additional items added in headphones PR 2017-07-09 19:45:53 -05:00
CitadelStationBot
90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
CitadelStationBot
b770348797 Fixes wrapping objects 2017-07-09 10:14:16 -05:00
CitadelStationBot
5a11f53535 Fixes flashbangs stunning for a maximum of 0.3 seconds instead of 6 seconds 2017-07-09 06:44:49 -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
LetterJay
b87632669e Merge pull request #1917 from Citadel-Station-13/upstream-merge-29061 
[MIRROR] Warp cubes are slightly less instant but way cooler
 2017-07-06 22:47:38 -05:00
CitadelStationBot
a101497539 Warp cubes are slightly less instant but way cooler 2017-07-06 20:12:38 -05:00
CitadelStationBot
55733ba0f4 Swords make sheathing/unsheating noises 2017-07-06 20:10:32 -05: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
CitadelStationBot
4796ede787 Adds Necropolis curses for cursed items in Necropolis ruins 2017-07-06 10:15:09 -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
LetterJay
652c641b04 Merge pull request #1892 from Citadel-Station-13/upstream-merge-29051 
[MIRROR] Replaces highpressure windows with plasma windows
 2017-07-06 10:03:11 -05:00
LetterJay
97b9b87f58 Merge pull request #1890 from Citadel-Station-13/upstream-merge-28989 
[MIRROR] Fixes cartridges not linking with their host PDAs on creation
 2017-07-06 09:26:40 -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
CitadelStationBot
cdb3158af5 Fixes cartridges not linking with their host PDAs on creation 2017-07-06 09:06:29 -05:00
CitadelStationBot
6c0926f062 Fixes forced two-handed weapons being unstorable 2017-07-06 08:26:00 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
7300c2572e [MIRROR] Fixes #28082 : Private Security cutouts have icons. (#1431) 
* Fixes #28082 : Private Security cutouts have icons.

* Create cardboard_cutouts.dm

* Update cardboard_cutouts.dm

* Delete cardboard_cutouts.dm.rej
 2017-07-05 08:44:07 -05:00
CitadelStationBot
509b9562d3 Gives AI radios loudmode (#1875) 2017-07-04 19:52:35 -07:00
CitadelStationBot
45fd6a1447 Fixes PDA runtime href exploit (#1868) 2017-07-04 15:47:06 -07:00
LetterJay
1054100178 Merge pull request #1447 from Citadel-Station-13/upstream-merge-28108 
[MIRROR] Renamed Volt Void to Volt Blaster and removed it consuming and scaling with power
 2017-07-03 17:46:37 -05:00
CitadelStationBot
73557a5e5f Fixes cardboard tube duping (#1854) 2017-07-01 21:20:39 -07:00
CitadelStationBot
c80d8af7aa [MIRROR] Makes dressers buildable (#1718) 
* Makes dressers buildable

* Delete sheet_types.dm.rej
 2017-06-30 21:26:11 -07:00
katnep
b21556329b TAUR SWEATERS and keyhole (#1827) 
by request of annoying whiners, here are sweaters in the clothes mate
have fun
 2017-06-30 21:25:17 -07:00
CitadelStationBot
8627946f72 Repathes mining_hammer -> kinetic_crusher. Also fixes offhands being qdel'd more than once (#1753) 2017-06-30 21:22:45 -07:00