cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 01:22:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,958 Commits 26 Branches 2 Tags
49ef4be0e67e2e54bd0c74dfa7829a5377f1ef2c
Commit Graph

17494 Commits

Author SHA1 Message Date
tigercat2000
49ef4be0e6 Merge pull request #9051 from Anasari/ConfirmationPossess 
Add confirmation prompt to possess object
 2018-06-13 13:27:11 -07:00
tigercat2000
70b1477133 Merge pull request #9070 from Fox-McCloud/plastic-surgery 
Adds Plastic Surgery; Fixes Disfigurement
 2018-06-13 13:20:00 -07:00
tigercat2000
9978e22487 Merge pull request #8893 from Ty-Omaha/CDC 
Adds more viruses to the Viral Outbreak event
 2018-06-10 17:50:14 -07:00
FalseIncarnate
d7c684ce39 Fixes #9097 
Food on utensils now inherits the source food's name.
 2018-06-09 13:07:41 -04:00
tigercat2000
a3dc1b5468 Merge pull request #8765 from DesolateG/ROBOEDNO 
Fixes ED-209 and floorbot + changes to ED-209 behavior.
 2018-06-08 12:22:35 -07:00
tigercat2000
2d9d4d51e1 Merge pull request #9002 from Kyep/ds_fix 
DS / prefs fix
 2018-06-08 11:59:05 -07:00
Crazy Lemon
5d1f5f5ef2 Merge pull request #8854 from tigercat2000/tcomms_optimize 
NTSL Optimizations
 2018-06-07 17:23:10 -07:00
tigercat2000
41ef6f0ed0 Merge pull request #9098 from RyanSmake/nar_she 
Ports TG's Nar'Sie
 2018-06-07 17:02:55 -07:00
tigercat2000
b9a6383188 Merge remote-tracking branch 'upstream/master' into tcomms_optimize 
# Conflicts:
#	code/game/machinery/telecomms/telecomunications.dm
 2018-06-07 15:04:57 -07:00
Ansari
0b0b1b7478 Make it so that spray displays coordinate of user (Instead of the spray which is always 0,0,0) 2018-06-07 22:33:27 +08:00
Bxil
a1f540f238 Ports TG's Nar'Sie 2018-06-06 18:48:16 +02:00
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
7fedb9363a capitals 2018-06-03 20:09:15 -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
Fox McCloud
50bd75186c tweak 2018-05-30 11:47:13 -04:00
Fox McCloud
b17d7ad335 Merge remote-tracking branch 'upstream/master' into plastic-surgery 2018-05-30 11:44:06 -04:00
Kyep
b48a2b5ee6 Merge remote-tracking branch 'ParadiseSS13/master' into ts_map_fix 2018-05-27 15:36:19 -07:00
Fox McCloud
bbfe4f675e fix redundancy 2018-05-27 15:04:45 -04:00
Fox McCloud
e9c4568c4f tweaks 2018-05-27 14:15:14 -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
tigercat2000
9e54ca5dc2 Merge pull request #9054 from Tayyyyyyy/ticket_bleed_fix 
Fix ticket bleed
 2018-05-25 19:33:31 -07:00
Tayyyyyyy
50aceae04d Revert unwanted style change 2018-05-25 19:02:13 -07:00
Tayyyyyyy
f00d350596 Fix powercell 2018-05-25 18:39:38 -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
dd120a00f0 Their 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
Ansari
f381b7516c Early return. 2018-05-26 09:09:41 +08:00