6cc0ea6af0
Merge pull request #2659 from Citadel-Station-13/upstream-merge-30412
...
[MIRROR] Regularizes resisting out of containers
2017-09-11 18:05:52 -05:00
ea82bf9bfa
Update suit_storage_unit.dm
2017-09-11 17:47:48 -05:00
6d88e3642b
Update suit_storage_unit.dm
2017-09-11 14:27:28 -05:00
02d7a04fb1
Update suit_storage_unit.dm
2017-09-11 14:06:01 -05:00
ba3f92fa17
Merge pull request #2671 from Citadel-Station-13/upstream-merge-30504
...
[MIRROR] Windoors open when emagged again
2017-09-09 01:05:30 -05:00
d60a6729d3
Merge pull request #30504 from YPOQ/windooremagfix
...
Windoors open when emagged again
2017-09-08 21:22:16 -05:00
25a5325e24
Merge pull request #30489 from Cyberboss/CompLightFix
...
Makes computers lose their light when their screens break
2017-09-08 21:01:39 -05:00
cf07ead653
Regularizes resisting out of containers
2017-09-08 09:58:34 -05:00
31102d0ec4
Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262
...
[MIRROR] Soft crit, except not terrible
2017-09-07 10:01:35 -05:00
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
17db844180
another mirror rebase for the PRMirror being down
2017-09-06 17:32:49 -05:00
bae0563d47
initial commit
2017-09-05 16:17:50 -05:00
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
92e055be97
Quick sync ( #2587 )
...
* sync since the mirror was down
* fucking byond
* can't forget these
2017-09-04 04:38:49 -05:00
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
17142cc247
Merge pull request #2530
2017-08-29 22:39:57 -07:00
d4c23fdcd1
Merge pull request #2546
2017-08-29 22:39:06 -07:00
9cb65df70d
Merge pull request #2426
2017-08-29 22:27:21 -07:00
5c7b743cfa
Merge pull request #2405
2017-08-29 22:27:10 -07:00
408acdd66d
sync
2017-08-29 22:05:16 -07:00
61159d6361
Merge branch 'master' into upstream-merge-30256
2017-08-29 20:17:03 -07:00
705427f05d
Merge branch 'master' into upstream-merge-30218
2017-08-29 20:15:47 -07:00
2b5d584c67
sync
2017-08-29 20:15:33 -07:00
38284056df
Fix rare AI tracking bug
2017-08-29 17:06:37 -05:00
301a581e64
sync
2017-08-29 09:41:11 -07:00
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
b39bd24aaa
Merge branch 'master' into upstream-merge-30218
2017-08-28 09:03:46 -05:00
472e39693f
Update allinone.dm
2017-08-28 09:02:35 -05:00
02ba44a8eb
Merge pull request #2505 from Citadel-Station-13/upstream-merge-30169
...
[MIRROR] Allows disabling shuttle purchases per map.
2017-08-28 08:56:33 -05:00
a6cc400a4b
Fixes allinone tcomms machine
2017-08-28 02:20:51 -05:00
94400c4d38
Allows disabling shuttle purchases per map.
2017-08-26 11:08:12 -05:00
18904f2f0f
Maintains that weird entire-tcomms-setup-in-one-machine thing
2017-08-26 11:08:01 -05:00
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
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
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
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
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
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
7a5497bb40
FUCK ( #2452 )
...
FUCK - Fixes Vending Machines
2017-08-21 20:12:22 -07:00
9b049e6f49
Rename machinery.dm to _machinery.dm
2017-08-21 19:42:43 -05:00
ae9e4495f9
Merge branch 'master' into upstream-merge-29747
2017-08-20 09:53:17 -05:00
940f5da5fd
Rename _machinery.dm to machinery.dm
2017-08-20 09:52:28 -05:00
08bbe72923
Update portable_turret.dm
2017-08-20 09:50:56 -05:00
0b57bbe184
Update iv_drip.dm
2017-08-20 09:50:22 -05:00
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
68830dac71
Changes smes, cells, cell charger, terminals and apcs icons
2017-08-16 20:02:24 -05:00
0ffaf66d1f
Merge branch 'master' into upstream-merge-29690
2017-08-15 19:18:22 -05:00
ab27b63cf9
Merge branch 'master' into upstream-merge-29611
2017-08-15 18:55:12 -05:00
41c9cf3a4a
Update machinery.dm
2017-08-15 18:53:10 -05:00
LetterJay