tigercat2000
56d78c433d
Merge pull request #7285 from Aurorablade/RingRingHello
...
Ring! Ring! Hello?
2018-06-06 00:19:07 -07:00
Crazy Lemon
1c516292ef
Merge pull request #8900 from Kyep/ts_map_fix
...
Terror Spider away mission pipes & vents
2018-06-05 11:39:06 -07:00
Aurorablade
cbf8db9097
Merge pull request #27 from tigercat2000/ai_eye_refactors
...
A handful of aiEye refactors
2018-06-05 00:38:41 -04:00
tigercat2000
a90a2176e7
A handful of aiEye refactors
2018-06-04 21:29:35 -07:00
Aurorablade
fbfefdce0d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello
2018-06-05 00:15:42 -04:00
Fox McCloud
482904befc
Merge pull request #9086 from tigercat2000/spacemandmm_fixes
...
Macro Refactor for SpacemanDMM
2018-06-03 19:45:33 -04:00
Fox McCloud
d09cff7128
tweak
2018-06-03 19:07:02 -04:00
Fox McCloud
7f2f766f70
Merge remote-tracking branch 'upstream/master' into attack-hulk
...
# Conflicts:
# code/game/objects/structures/window.dm
2018-06-03 18:49:44 -04:00
uraniummeltdown
75bded82cf
added defines for window construction states and full window diagonal dir
...
added a proc to check for valid window location, added var/fulltile to windows instead of using a proc
added clockwork windoors and windows to brass recipes
added titanium glass and plastitanium glass, made glass types use recipes like other stacks, you can smelt the new glasses in the ORM
removed force from RCD and added NOBLUDGEON flag, fixing a bug where you couldn't deconstruct airlocks with an RCD
slight nerf to wielded fireaxe, does high damage to windows and grilles instead of insta-deleting them
deleted fullwindow.dm and moved windows to window.dm
added some feedback to placing glass on grilles
examining windoor assembly shows you can rotate it, examining windows show deconstruction hints and rotation
added cracks to windows, you can repair windows using a welding tool on help intent, slight buff to window health
added var/cancolor to windows and blacklists some windows from being auto-colored, window shards also get colored on narsie_act()
full windows now use icon smoothing system, windows now use the obj_integrity damage system
added is_glass_sheet() helper
2018-06-03 13:11:37 +04:00
tigercat2000
5ace5944d9
Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings
2018-05-31 19:34:47 -07:00
FalseIncarnate
18a0ff541e
Better solution
...
Repathed the point decal to the temp_visual effects path. This path has
built-in singularity resistance, and allows me to remove a spawn in
favor of a built-in QDEL_IN call
Also changed points from using the magic number 16 to POINT_LAYER for
their layer definition. This does technically drop the point by 4 layers
(POINT_LAYER is 12), placing them now below the light layer (shouldn't
affect anything) instead of just above it.
2018-05-30 21:55:26 -04:00
Kyep
b48a2b5ee6
Merge remote-tracking branch 'ParadiseSS13/master' into ts_map_fix
2018-05-27 15:36:19 -07:00
Alffd
f83e8b6aa7
Fix no ToS error
2018-05-26 19:08:53 -04:00
tigercat2000
baf5fe64a7
Merge pull request #8967 from Tayyyyyyy/pronouns
...
Pronouns!
2018-05-25 19:39:11 -07:00
tigercat2000
a1d2261970
Merge pull request #9071 from Allfd/tos
...
Terms of service
2018-05-25 19:38:22 -07:00
Tayyyyyyy
bc977804de
Small fixes
2018-05-25 18:39:38 -07:00
Tayyyyyyy
96be9a80ea
Missed a t_him
2018-05-25 18:39:38 -07:00
Tayyyyyyy
0ee6cde88e
Fix a few style issues
2018-05-25 18:39:38 -07:00
Tayyyyyyy
919bd7aaf2
Replace \his, \he, \him, \himself
2018-05-25 18:39:37 -07:00
Tayyyyyyy
09fb007cfc
Fix examine
2018-05-25 18:34:29 -07:00
Tayyyyyyy
98c6ddf5a7
Fix his, he, him
2018-05-25 18:34:28 -07:00
Tayyyyyyy
aa9d658847
Them
2018-05-25 18:34:28 -07:00
Tayyyyyyy
42f85919de
More their
2018-05-25 18:34:26 -07:00
Tayyyyyyy
ad23362781
Death
2018-05-25 18:34:24 -07:00
Tayyyyyyy
bc210f595b
Examine
2018-05-25 18:34:24 -07:00
Tayyyyyyy
e6ead787c4
Use get_visible_gender
2018-05-25 18:34:23 -07:00
Tayyyyyyy
c80704e724
Conjugating verbs is hard
2018-05-25 18:34:23 -07:00
Tayyyyyyy
170266d827
More pronouns
2018-05-25 18:34:23 -07:00
Tayyyyyyy
497072d4d1
Update pronoun usage
2018-05-25 18:34:22 -07:00
Alffd
83305fa790
Probably fine
2018-05-25 16:35:48 -04:00
Alffd
61d746e009
Tiger changes
2018-05-25 15:51:03 -04:00
Alffd
e00c98fdde
Space saving
2018-05-25 14:05:05 -04:00
Alffd
ef1b44b955
Terms of service click through.
2018-05-25 03:40:16 -04:00
Fox McCloud
404c712aea
Removes the last of the color macros
2018-05-23 14:05:17 -04:00
Fox McCloud
4b2413f66d
forgot a spawn
2018-05-20 00:04:23 -04:00
Fox McCloud
fc7692cdce
alien object damage system
2018-05-19 03:26:10 -04:00
Fox McCloud
a87170255b
Makes Hulk Attacking Less Snowflakey
2018-05-19 02:32:34 -04:00
Aurorablade
69ab788689
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello
2018-05-18 00:19:32 -04:00
Fox McCloud
224b18af1c
Merge remote-tracking branch 'upstream/master' into attack-animation-improvements
2018-05-17 23:34:01 -04:00
Crazy Lemon
7aa9731e52
Merge pull request #8898 from tigercat2000/face_lock
...
Directional Locking
2018-05-17 20:28:03 -07:00
tigercat2000
85a19c9935
Merge remote-tracking branch 'upstream/master' into face_lock
...
# Conflicts:
# code/modules/mob/mob.dm
2018-05-17 20:21:39 -07:00
tigercat2000
1cfc3f27c8
Merge pull request #8974 from Fox-McCloud/holo-projector
...
Ports Holoprojectors
2018-05-17 20:19:13 -07:00
Fox McCloud
c0d5655f4d
Further Improves Attack Animations
2018-05-17 19:48:03 -04:00
Fox McCloud
709f2b5ff6
Merge pull request #9004 from Anasari/BotLogging
...
Naming bots is now logged
2018-05-15 22:06:46 -04:00
Fox McCloud
4c1dc7dea7
Merge pull request #9017 from Tayyyyyyy/punpun
...
Restore Pun Pun
2018-05-15 17:59:57 -04:00
Tayyyyyyy
8a8f244d3f
Remove unneeded args
2018-05-15 01:15:27 -07:00
Tayyyyyyy
fea1dada3a
Restore Pun Pun
2018-05-14 22:31:05 -07:00
Crazy Lemon
63ec546a0a
Merge pull request #9008 from Fox-McCloud/remove-mode
...
Removes All Modes
2018-05-14 17:49:58 -07:00
Fox McCloud
b3524505b5
tweak
2018-05-14 17:51:13 -04:00
Ansari
69cefb7f3c
Actually fix usr to user and compile
2018-05-12 10:28:26 +08:00
