Ghommie
|
a3c2ed0b52
|
fixes.
|
2019-06-15 02:19:57 +02:00 |
|
Ghommie
|
e2bf5b73fd
|
I'm being too careless, sorry for the many commits.
|
2019-06-12 23:22:31 +02:00 |
|
Ghommie
|
7a8eaf41ac
|
another get_cell()
|
2019-06-12 23:21:42 +02:00 |
|
Ghommie
|
5ba46eb517
|
Avoid runtiming.
|
2019-06-12 23:20:34 +02:00 |
|
Ghommie
|
2edef99b08
|
.
|
2019-06-12 23:16:27 +02:00 |
|
Ghommie
|
a29095cbe1
|
Penitence for the awful mistakes I have done in the refactor.
|
2019-06-12 23:06:09 +02:00 |
|
Ghommie
|
5a35e95735
|
.
|
2019-06-12 22:52:05 +02:00 |
|
Ghommie
|
4cc7636da1
|
fixing more.
|
2019-06-12 22:50:09 +02:00 |
|
Ghommie
|
368267f53d
|
dddddd
|
2019-06-12 20:31:24 +02:00 |
|
Ghommie
|
516b71ed7e
|
fixing stunbatons.
|
2019-06-12 20:13:08 +02:00 |
|
kevinz000
|
54b3568319
|
Merge pull request #8599 from Poojawa/pacifistic-vore
Pacifists can nom things now, but not feed to others
|
2019-06-11 11:13:01 -07:00 |
|
kevinz000
|
d2b40ea73d
|
Merge pull request #8610 from Sishen1542/fingerlessinsuls
Changes assistant family heirloom to a pair of fingerless insulated gloves
|
2019-06-11 11:03:56 -07:00 |
|
kevinz000
|
6ead9bbe65
|
Merge pull request #8587 from SkullyRoberts/DickImplant
Added a single use penis autosurgeon as rare maint loot. Because why the hell not?
|
2019-06-11 10:56:44 -07:00 |
|
Sishen
|
13853ac6bf
|
removes family gavel, readds briefcase
|
2019-06-10 10:16:32 -04:00 |
|
Sishen
|
400ad0b03b
|
added family gavel
|
2019-06-10 09:55:23 -04:00 |
|
Sishen
|
9f80fbe68b
|
Coloring gloves? Not on my watch!
|
2019-06-10 05:20:54 -04:00 |
|
Sishen
|
4eccc12205
|
Why are we here? Just to suffer?
|
2019-06-10 04:56:24 -04:00 |
|
AnalWerewolf
|
8337692650
|
Merge branch 'master' into Fritz-cute
|
2019-06-10 15:15:41 +10:00 |
|
Poojawa
|
3f1b7e4dd6
|
Pacifists can nom things now, but not feed to others
|
2019-06-09 02:23:53 -05:00 |
|
kevinz000
|
ec9ae5348f
|
Merge remote-tracking branch 'origin/master' into kevinz000-patch-48
|
2019-06-08 19:10:59 -07:00 |
|
kevinz000
|
1a07f304c9
|
Update examine.dm
|
2019-06-08 17:32:36 -07:00 |
|
kevinz000
|
5cf0a9e67f
|
Update carbon_defense.dm
|
2019-06-08 17:30:50 -07:00 |
|
Thalpy
|
628482e53b
|
Merge branch 'master' into FriendlyEmpathy
|
2019-06-08 23:45:37 +01:00 |
|
SkullyRoberts
|
e83365daed
|
Added a penis autosurgeon as rare maint loot
|
2019-06-08 17:12:51 -04:00 |
|
kevinz000
|
543c9c07e2
|
Merge pull request #8567 from Arturlang/RPD-Update
You can now use an RPD on windows and Grilles.
|
2019-06-08 12:05:26 -07:00 |
|
kevinz000
|
b69986e544
|
Merge pull request #8514 from BurgerLUA/Arcade-Loot-Improvements
Arcade Loot Improvements + Battlemachine Tweaks
|
2019-06-08 03:53:13 -07:00 |
|
kevinz000
|
50cee124c5
|
Merge pull request #8563 from Sishen1542/Prideful
Pride-struck Hammer in hands/on back
|
2019-06-08 03:00:05 -07:00 |
|
kevinz000
|
bd0e16461b
|
Merge pull request #8522 from Useroth/changeling-hentai
Made the changeling tentacle disarm a bit more reliable.
|
2019-06-08 01:32:52 -07:00 |
|
kevinz000
|
d36b8068fa
|
Merge pull request #8556 from Poojawa/ninja-speak
Gives Ninjas back their Weeb speech modification
|
2019-06-08 01:29:42 -07:00 |
|
kevinz000
|
d28754cb4d
|
Merge pull request #8560 from Ghommie/Ghommie-cit37
Ports in the fix against hitting oneself with one's own thrown items.
|
2019-06-08 01:27:43 -07:00 |
|
kevinz000
|
658f14275b
|
Merge pull request #8559 from Ghommie/Ghommie-cit36
Ports in the get_area conversion to define.
|
2019-06-08 01:26:45 -07:00 |
|
kevinz000
|
2f2885f1d6
|
Merge pull request #8558 from Ghommie/Ghommie-cit35
Ports in the container_type to reagents flags refactor.
|
2019-06-08 01:26:28 -07:00 |
|
kevinz000
|
4650e4d353
|
Merge pull request #8557 from Ghommie/Ghommie-cit34
Ports the fix for that stupid z-level edge pull breaking bug.
|
2019-06-08 01:26:17 -07:00 |
|
kevinz000
|
aca85123be
|
Merge pull request #8555 from Ghommie/Ghommie-cit32
Updates radials, makes RCD and RCL use em.
|
2019-06-08 01:25:37 -07:00 |
|
kevinz000
|
1488af1a52
|
Merge pull request #8554 from Ghommie/Ghommie-cit33
Adds AI core screen selection to character preferences and turns icon selection menu into a radial.
|
2019-06-08 01:24:59 -07:00 |
|
kevinz000
|
eb1c767ab7
|
Merge pull request #8553 from Poojawa/ghost-erp
Clarifies a few things about subtler and how it should be used
|
2019-06-08 01:24:36 -07:00 |
|
kevinz000
|
ae5d4de111
|
Merge pull request #8552 from Ghommie/Ghommie-cit31
Ports "Fixes goonchat cookies not saving properly."
|
2019-06-08 01:24:16 -07:00 |
|
kevinz000
|
95abaf6a6e
|
Merge pull request #8551 from Ghommie/Ghommie-cit30
Port paradise goonchat uridecode fix
|
2019-06-08 01:23:59 -07:00 |
|
kevinz000
|
4050ba98eb
|
Merge pull request #8549 from Trilbyspaceclone/patch-168
Fixes a unseen paper work exsplote
|
2019-06-08 01:23:31 -07:00 |
|
kevinz000
|
ab565d2483
|
Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
|
2019-06-08 01:22:16 -07:00 |
|
kevinz000
|
88990f5ae0
|
Merge pull request #8544 from Trilbyspaceclone/patch-166
Makes ice cream vats and food carts buy-able via cargo
|
2019-06-08 01:21:41 -07:00 |
|
kevinz000
|
a37bf5bfaf
|
Merge pull request #8541 from Trilbyspaceclone/patch-164
Adds implanter and implanter cases to syndie surgery bags
|
2019-06-08 01:21:28 -07:00 |
|
kevinz000
|
9edac9fc6c
|
Merge pull request #8540 from BurgerLUA/assssssssssssssssssssssss
Rebalanced Ass Slapping
|
2019-06-08 01:17:04 -07:00 |
|
kevinz000
|
a866ceb8a2
|
Merge pull request #8543 from Trilbyspaceclone/patch-165
Makes SNOWCONES!
|
2019-06-08 01:15:58 -07:00 |
|
kevinz000
|
e518d6e4b1
|
Merge pull request #8490 from SkullyRoberts/Heelys
Added toggle-able rainbow lightup shoes and functional heelys to maint loot
|
2019-06-08 01:12:57 -07:00 |
|
kevinz000
|
f458828659
|
Merge pull request #8503 from Trilbyspaceclone/patch-159
Changing up the drills/picks/jackhammer a bit
|
2019-06-08 01:10:34 -07:00 |
|
kevinz000
|
80aa303b4e
|
Merge pull request #8501 from Trilbyspaceclone/boxen
Colored boxes, more box icons, and more craftable box types!
|
2019-06-08 01:10:11 -07:00 |
|
kevinz000
|
f201bd1508
|
Merge pull request #8494 from Trilbyspaceclone/ash_walker
Ash walker bone satchles.
|
2019-06-08 01:09:26 -07:00 |
|
kevinz000
|
487461fbda
|
Merge pull request #8500 from Trilbyspaceclone/patch-158
Buffs stun slugs
|
2019-06-08 01:09:00 -07:00 |
|
kevinz000
|
c8435a5658
|
Merge pull request #8414 from Trilbyspaceclone/MASON
New M.A.S.O.N rig
|
2019-06-08 01:08:00 -07:00 |
|