803bff4e5f
funny
2020-11-12 23:34:42 -07:00
30ab79e09e
Porting the twohanded component.
2020-05-17 18:16:53 +02:00
94f014589d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
2020-04-25 17:09:34 +02:00
eafc69aa65
Reviewer suggestion, reduces paralyze
...
And ports that commit that ghommie said
2020-04-17 16:22:15 +03:00
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
fe755a1424
Tackling Working so far, working on the lunge now
2020-04-09 21:42:00 +03:00
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
a8778417e4
Update standard.dm
2020-02-11 15:52:41 -05:00
c9dc35fd9a
Updates the debug outfit
2020-02-06 18:42:23 +01:00
856ef236f3
Further runtime fixes by AnturK.
2020-01-24 23:01:30 +01:00
e74339ce8b
Jfc that's a lot of work!
2019-12-23 04:24:13 +01:00
69f27e19fe
Touching up job outfits equip procs, little PDA fix.
2019-10-18 18:02:24 +02:00
0c9a065096
Merge pull request #8401 from Ghommie/Ghommie-cit11
...
Refactoring Implants' loc n°3
2019-10-10 02:09:37 -07:00
99e9280eaf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit178
2019-10-07 21:41:04 +02:00
32a73b24c0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
2019-10-05 18:22:43 +02:00
86cb735cc9
Merge branch 'master' into kevinz000-patch-64
2019-08-18 23:41:40 -07:00
542915faa6
Update ert.dm
2019-08-16 10:53:24 -04:00
26de2b8111
greybois
2019-08-16 10:49:26 -04:00
5ee9b4d4f4
part 1 plasmaman stuff.
2019-08-01 06:58:21 +02:00
2970ee54a9
fix ur code catman
2019-07-17 18:05:34 -04:00
9995876a59
Update ert.dm
2019-07-15 17:00:31 -07:00
fac3e65c68
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
2019-07-15 17:42:47 +02:00
618c2c070c
Update ert.dm
2019-05-30 11:36:20 -04:00
ced2ee0ad0
Painbow extract. Cluwne.
2019-03-19 14:48:35 +01:00
284e9d0325
module things, jfc
2018-09-11 07:51:01 -05:00
b1688405d9
and finally, the modules folder. Now I can publish and take a break
2018-07-02 01:19:37 -04:00
997d85329c
Merge pull request #38380 from AutomaticFrenzy/patch/vr-plasmemes
...
Give plasmamen their plasma suits in VR
2018-06-11 22:29:43 -05:00
67841c3f19
Fixes pocket items being deleted when monkeyizing ( #38220 )
2018-06-03 09:04:08 -05:00
2f9e3e403d
Hard upstream sync ( #6951 )
...
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
5518efebea
everything but mob stuff
2018-04-23 01:06:17 -05:00
b74454bf5c
[MIRROR] Tweaks to ERT creation ( #6021 )
...
* inquisition ert tweak (#36511 )
* Tweaks to ERT creation
2018-03-19 21:18:02 -05:00
c91006c27f
[MIRROR] Create ERT refactor ( #5924 )
...
* Create ERT refactor (#36321 )
cl Naksu
admin: ERT creation has been refactored to allow for easier customization and deployment via templates and settings
/cl
* Create ERT refactor
2018-03-12 07:30:03 -05:00
0dbc2241ea
modules: A to C
2018-01-04 00:46:53 -05:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
43113cd9b5
Merge pull request #31947 from AnturK/yarr
...
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.
If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.
There's an internal GPS onboard so crew will always be able to follow the shuttle.
Crew of 3, moderately armed. (Balance pending)
Shuttle engines have 3 minute cooldown between jumps.
Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
5be4669924
Datum antag wizard.
2017-10-11 05:24:17 -05:00
b05a4ebb29
Makes the santa event properly poll ghosts ( #31437 )
...
* Makes the santa event properly poll ghosts
* Update xmas.dm
* Update xmas.dm
* Create event.dm
* Update tgstation.dme
* Update xmas.dm
* Update event.dm
* Update event.dm
* Update event.dm
* Update event.dm
* Update event.dm
* Update event.dm
2017-10-10 03:16:23 -05:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
313ba00dd5
Deathsquads no longer get shielded hardsuits
2017-08-15 09:59:51 -05:00
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
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
bbc28aa856
Energy swords and other transforming energy weapons are now subtypes of transforming weapons ( #2049 )
2017-07-17 22:51:51 -07:00
609ae007ae
Changes all access const to be a define
2017-07-16 11:44:47 -05:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
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
936e1d3061
Missed during mirror downtime
2017-05-24 08:40:45 -05:00
a317d23a51
[MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie ( #916 )
...
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie
* fixes .rej
2017-05-18 09:37:30 -05:00
9e72b1b8fd
/tg/ 4/14 ( #367 )
...
* outside code stuff
* defines, helpers, etc
* everything not module
* modules
* compiled fixes + missing sounds
2017-04-14 23:28:04 -05:00
silicons