ca86c93e70
Merge pull request #6676 from Citadel-Station-13/upstream-merge-37406
...
[MIRROR] Adds (fake) ambient occlusion as a client preference
2018-05-13 11:52:23 -05:00
37f972dc6c
Update obj_flags.dm
2018-05-13 10:17:36 -05:00
e1fef511cf
Update flags.dm
2018-05-13 10:17:28 -05:00
289cbbb375
Merge pull request #6718 from Citadel-Station-13/upstream-merge-37697
...
[MIRROR] Makes the redirect component able to transfer with changeturfs
2018-05-13 03:28:57 -05:00
80aad142a4
Merge branch 'master' into upstream-merge-37406
2018-05-13 03:28:37 -05:00
f21cac1af2
Merge pull request #6700 from Citadel-Station-13/upstream-merge-37399
...
[MIRROR] Use spritesheets to reduce time spent sending PNG assets by 90+%
2018-05-12 17:04:23 -05:00
b036b1e519
Makes the redirect component able to transfer with changeturfs ( #37697 )
2018-05-12 16:29:28 -05:00
37b9d589ad
Merge pull request #6679 from Citadel-Station-13/upstream-merge-37396
...
[MIRROR] Track admin observer time
2018-05-11 03:45:11 +00:00
7acf54f5fc
Update misc.dm
2018-05-10 23:37:20 -04:00
3819a5a9b5
Fixes EMPs ( #37656 )
2018-05-10 01:33:25 -05:00
111ad79eab
Use spritesheets to reduce time spent sending PNG assets by 90+%
2018-05-09 22:44:57 -05:00
1a25c685a1
Update DMAPI to version 3.2.1.0
2018-05-08 21:33:58 -05:00
baee4dead5
Merge pull request #37396 from KorPhaeron/mrcitruswantsyoutoclockin
...
Track admin observer time
2018-05-08 13:38:13 -05:00
bc6fbeb9fe
Adds (fake) ambient occlusion as a client preference
2018-05-07 22:08:08 -05:00
e0412f6325
Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
2018-05-06 16:37:13 -05:00
50f8779fc0
Merge branch 'master' into upstream-merge-37486
2018-05-06 07:15:48 +00:00
b7b7112382
Update flags.dm
2018-05-06 03:08:53 -04:00
e8e0d8f77f
Update components.dm
2018-05-06 03:08:14 -04:00
6a07a66cb3
Merge branch 'master' into upstream-merge-37476
2018-05-06 07:07:02 +00:00
0958d35b26
replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2
2018-05-02 13:14:43 -05:00
55566461c6
Merge pull request #6601 from Citadel-Station-13/upstream-merge-37565
...
[MIRROR] Modifies component transfer to make ChangeTurf able to transfer components
2018-05-02 13:59:14 +00:00
5c40a38457
Merge pull request #6609 from Citadel-Station-13/upstream-merge-37584
...
[MIRROR] Readds missing nuked narsie cinematic.
2018-05-02 01:30:19 +00:00
d26ba53e91
Merge pull request #6596 from Citadel-Station-13/upstream-merge-37513
...
[MIRROR] Adds traits for a character's preference towards pineapples.
2018-05-02 01:25:04 +00:00
e26f1cd78b
Merge pull request #6553 from Citadel-Station-13/upstream-merge-37165
...
[MIRROR] NTNet improvements!
2018-05-02 01:17:10 +00:00
76302a217e
Readds missing nuked narsie cinematic. ( #37584 )
2018-05-01 11:05:16 -05:00
1675490652
Modifies component transfer to make ChangeTurf able to transfer components
2018-04-30 21:16:48 -05:00
12eb6a8a97
Merge pull request #37513 from ShizCalev/pineapple-memes
...
Adds traits for a character's preference towards pineapples.
2018-04-30 13:02:05 -05:00
3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
b7cdd6a7fd
Update networks.dm
2018-04-29 18:48:26 -04:00
b3b84b3dda
Update flags.dm
2018-04-29 18:36:49 -04:00
ec2de88a65
Replaces HEALS_EARS_2 with a component, adds a wearertargeting parent component for future use
2018-04-29 17:32:12 -05:00
f373b2c9e6
Kills off three more flags from flags_2
2018-04-29 17:30:55 -05:00
44f966d0eb
Merge pull request #6540 from Citadel-Station-13/upstream-merge-37461
...
[MIRROR] Removes the signals on process procs
2018-04-29 02:24:04 -05:00
b565ef9171
Merge pull request #6557 from Citadel-Station-13/upstream-merge-37384
...
[MIRROR] Re-adds and reworks fusion.
2018-04-28 14:07:08 -05:00
3f6167d08e
Moves several clothing-specific flags from /atom to their proper type
2018-04-28 13:21:48 -05:00
9b36d6c4d9
Re-adds and reworks fusion. ( #37384 )
...
add: Fusion is back
add: Fusion now happens with large quantities of hot plasma and CO2, consuming all the plasma rapidly and producing large amounts of energy. Other gases can also effect the performance of the reaction.
add: Fusion now produces radiation. Be careful around reactors.
fix: fixes fusion dividing by zero and destroying everything
code: Gas reactions now have access to where they are occurring
fix: Prevents some other reactions from producing matter from nothing
2018-04-28 01:01:47 -05:00
2b2ff05b73
Modified bomb and syndicate bomb spawner so Cuban Pete bombs maxcap and work again
2018-04-27 20:28:55 -05:00
48ef6d2349
Adds log and management tabs to permissions panel
2018-04-27 20:26:42 -05:00
6ed120aad4
NTNet improvements!
2018-04-27 20:24:28 -05:00
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
ce5ccc8498
Removes the signals on process procs ( #37461 )
2018-04-27 13:04:24 -05:00
d6b48869d8
Adds a stationloving component to replace a couple of flags and SSinbounds with ( #37436 )
...
* station lovin' happened so fast
* Update stationloving.dm
* less qdel memes
* imbue soul signal
* rename imbue soul signal
* dupemode
* henk
* Update atoms_movable.dm
* Update nuclearbomb.dm
* Update nuclearbomb.dm
2018-04-27 07:37:15 -05:00
0d5d992732
compile fixes + initial map port
2018-04-23 03:37:10 -05:00
f2b0456dc5
defines, helpers, onclick
2018-04-22 23:56:25 -05:00
4d0597ad5b
Parenthesizes some macros ( #37212 )
...
* parenthesizes some macros
* A couple more macro definition parenthesizing
2018-04-16 03:47:46 -05:00
5eab3eb454
Rounded the last digit of pi correctly ( #37148 )
...
It's important, fellas. Makes pi 0.000007 wrong instead of 0.00009 wrong.
2018-04-13 07:51:06 -05:00
eebe38dc39
Merge pull request #6367 from Citadel-Station-13/upstream-merge-37136
...
[MIRROR] Removes some unused math defines/procs
2018-04-11 21:27:58 +00:00
ba276cf374
Merge pull request #6373 from Citadel-Station-13/upstream-merge-37116
...
[MIRROR] Fixes order of operations math errors with gas defines.
2018-04-11 21:26:47 +00:00
adac58f0c2
Fixes order of operations math errors with gas defines.
2018-04-11 15:02:22 -05:00
d559fc1bd3
remove 512 version checks
2018-04-11 14:26:41 -05:00
LetterJay