Commit Graph

8244 Commits

Author SHA1 Message Date
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
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
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
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
Ansari
de818d92ab user instead of usr 2018-05-12 10:14:14 +08:00
Fox McCloud
f521f2765c Removes All Modes 2018-05-11 17:55:45 -04:00
Ansari
6084f5cfef Log bot 2018-05-10 16:32:34 +08:00
tigercat2000
254cdd6055 Merge pull request #8972 from Fox-McCloud/power-cell
Power Cell Code Cleanup
2018-05-09 11:26:03 -07:00
tigercat2000
aedece7207 Merge pull request #8989 from Kyep/nations_etc_borg_runtime
Fixes #8271 - rare borg runtimes
2018-05-09 11:22:04 -07:00
Fox McCloud
7d4fb45509 Merge pull request #8947 from tigercat2000/more_ss_ports
SS Conversion: Atoms, Machines, n' Mobs
2018-05-07 17:54:49 -04:00
Kyep
a6d06ea397 Fixes #8271 - rare borg runtimes 2018-05-06 22:21:35 -07:00
tigercat2000
c78075414c Merge pull request #8488 from Kyep/ds_tweaks
Tweaks Deathsquad
2018-05-04 19:03:54 -07:00
Fox McCloud
8845262d65 Merge remote-tracking branch 'upstream/master' into holo-projector
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	paradise.dme
2018-05-04 16:37:24 -04:00
Fox McCloud
8bd042240f Power Cell Code Cleanup 2018-05-02 19:35:18 -04:00
tigercat2000
cacde22a27 Readd human/New warning about excessive arguments 2018-04-30 09:36:22 -07:00
tigercat2000
7fb8f8d76c Merge remote-tracking branch 'upstream/master' into more_ss_ports
# Conflicts:
#	paradise.dme
2018-04-30 09:27:11 -07:00
Fox McCloud
b394cf3624 Ports Holoprojectors 2018-04-30 00:24:46 -04:00
tigercat2000
3c1fbf9cc5 Merge pull request #8938 from Fox-McCloud/guillotine
Ports Guillotine
2018-04-29 20:28:50 -07:00