CitadelStationBot
6efb76fad5
[MIRROR] Ammo cleanup ( #2643 )
...
* Ammo cleanup
* Update briefcase.dm
* Update manned_turret.dm
* Update mime.dm
* Update manned_turret.dm
* Update manned_turret.dm
* fixes
* mime memes
2017-09-22 22:30:44 -05:00
CitadelStationBot
0925853992
[MIRROR] [S] fixes sentience potions working through cams ( #2896 )
...
* Fixes sentience potions working through cams (#30914 )
* [S] fixes sentience potions working through cams
2017-09-22 19:00:07 -05:00
Poojawa
573a81a4d9
Reapplies material componets
2017-09-22 09:31:39 -05:00
CitadelStationBot
4bc6e9d522
[MIRROR] Cleaned up some decimal values. ( #2797 )
...
* Cleaned up some decimal values.
* Update gas_mixture.dm
* Update color.dm
* Update medsci.dm
2017-09-18 01:45:39 -05:00
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
LetterJay
01b0e754c2
Merge pull request #2679 from Citadel-Station-13/upstream-merge-30531
...
[MIRROR] Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
2017-09-12 02:35:17 -05:00
Firecage
1e0297f9ef
Adds cybernetic lungs(and an upgraded and actually useful variety) to the game. ( #30382 )
...
* Adds cybernetic lungs
* Added better cold thresholds to the upgraded cybernetic lungs. Heat threshold remains the same though for balance reasons.
* Adds an EMP effect to cybernetic lungs.
2017-09-10 14:31:47 -05:00
Kerbin-Fiber
d158ec9528
Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
2017-09-10 03:43:09 -05:00
Poojawa
5f1d88ffeb
Revert "[MIRROR] Port material containers to datum components" ( #2597 )
...
* Revert "sprite fix on kitsune tails"
This reverts commit 44d5b21a43#2591 )"
This reverts commit 7f46280d6b#2590 [ci skip]"
This reverts commit 201e07033f#2590 )"
This reverts commit 5c98b9a13b#2587 )"
This reverts commit 92e055be97#2557 [ci skip]"
This reverts commit 241a10d88d#2557 )"
This reverts commit d959b7538a#2562 )"
This reverts commit 32300086d5
2017-09-04 09:07:40 -05:00
CitadelStationBot
32300086d5
[MIRROR] Port material containers to datum components ( #2562 )
...
* Port material containers to datum components
* Fixes Rej
2017-09-04 04:08:42 -05:00
kevinz000
5c7b743cfa
Merge pull request #2405
2017-08-29 22:27:10 -07:00
kevinz000
301a581e64
sync
2017-08-29 09:41:11 -07:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
CitadelStationBot
66f046fe87
Fixes timestop spell ( #2506 )
2017-08-26 19:49:16 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -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
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05: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
LetterJay
f2f1474123
Merge pull request #2322 from Citadel-Station-13/upstream-merge-29747
...
[MIRROR] Removes a great amount of machinery copypasta with circuitboards.
2017-08-21 20:32:10 -05:00
Poojawa
91fc414b20
Changes Ghost role ping sound effects ( #2441 )
...
* change that fucking blare
* Update xenobiology.dm
2017-08-21 17:05:09 -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
4d19a89519
Removes a great amount of machinery copypasta with circuitboards.
2017-08-09 19:24:19 -05:00
CitadelStationBot
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
CitadelStationBot
5fd31559ea
[MIRROR] Fixed typo for cyberimp_surgical's ID ( #2229 )
...
* Fixed typo for cyberimp_surgical's ID
* Delete medical_designs.dm.rej
* Update medical_designs.dm
2017-08-05 10:29:02 -07:00
CitadelStationBot
fd59456a73
[MIRROR] Adds Surgical toolarms to R&D, makes them less robust ( #2197 )
...
* Adds Surgical toolarms to R&D, makes them less robust
* Delete medical_designs.dm
* Delete augments_arms.dm
* Delete tools.dm
2017-08-05 10:27:12 -07:00
CitadelStationBot
1b22c5fe0c
[MIRROR] Separates actions.dmi into multiple files ( #2214 )
...
* Separates actions.dmi into multiple files
* Delete beam_rifle.dm.rej
* Delete action.dm.rej
2017-08-03 06:09:39 -07:00
CitadelStationBot
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
CitadelStationBot
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
LetterJay
35fba1933e
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
...
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
CitadelStationBot
d2e771c9f3
Adds cybernetic organs ( #2135 )
2017-07-26 00:04:59 -07:00
CitadelStationBot
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
CitadelStationBot
609ae007ae
Changes all access const to be a define
2017-07-16 11:44:47 -05:00
CitadelStationBot
d21766956e
[MIRROR] Cleaned up some emag_acts ( #2018 )
...
* Cleaned up some emag_acts
* Delete port_gen.dm.rej
* Update port_gen.dm
2017-07-15 13:17:56 -07:00
CitadelStationBot
b2f20fffd8
Fixes timestop! (and tweaks its sounds) ( #2019 )
2017-07-15 11:45:11 -07:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
CitadelStationBot
2d84e09851
Fixes plasma glass merging with normal glass
2017-07-08 09:45:46 -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
beccb4742f
Replaces all instances of spawn() with addtimer/INVOKE_ASYNC
2017-07-06 09:14:03 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
793a2ce28f
Grammar and message tweaks ( #1722 )
2017-07-01 21:22:29 -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
CitadelStationBot
65736b7e23
[MIRROR] Ports the Ore Redemption Machine to TGUI ( #1414 )
...
* Ports the Ore Redemption Machine to TGUI
* Update tgui.css
* Update tgui.js
* Delete tgui.css.rej
* Delete tgui.js.rej
2017-06-28 02:24:55 -05:00
CitadelStationBot
6a38955803
Adds container types INJECTABLE and DRAWABLE
2017-06-27 08:19:49 -05:00
CitadelStationBot
2530d8a09a
Intercoms are now constructable
2017-06-23 13:40:25 -05:00
LetterJay
d04001c09d
another huge sync
2017-06-21 18:00:00 -05:00
CitadelStationBot
35ac6c40e0
Remember to test your PRs, kids! - Rebalances matter cartridge cost redux ( #1652 )
2017-06-20 07:59:04 -07:00
LetterJay
3e6a5f2d06
Merge pull request #1670 from Citadel-Station-13/upstream-merge-28549
...
[MIRROR] Makes gender change potions more noticeable
2017-06-19 20:47:56 -05:00
LetterJay
d65e8667e7
Merge pull request #1465 from Citadel-Station-13/upstream-merge-28160
...
[MIRROR] Fixes ORM alloy material consumption
2017-06-19 15:51:08 -05:00
