oranges
54beec00e8
Merge pull request #21694 from KorPhaeron/mining_with_friends
...
Adds the mining conscription kit, go mining with your metafriends
2016-11-26 15:19:34 +13:00
oranges
c95df11ed8
Merge pull request #21710 from MMMiracles/remotes/origin/master
...
Jump Boots Fix + Tweak
2016-11-26 15:07:02 +13:00
oranges
c3106e4574
Merge pull request #21736 from lzimann/grappa
...
Adds an icon to grappa
2016-11-26 15:06:03 +13:00
Shadowlight213
e7f5e1b136
Fixes addtimer for doors on shuttles
2016-11-25 14:41:32 -08:00
oranges
ac9c02ee18
Merge pull request #21704 from KorPhaeron/40minutesofwarningisntenough
...
You can now see which emergency shuttle is coming in the status panel
2016-11-25 22:06:41 +13:00
oranges
f67cd8e628
Merge pull request #21707 from swindly/wetleather
...
Makes drying racks dry leather
2016-11-25 22:06:30 +13:00
Mervill
787e98cced
disposal unit now uses a tgui ( #21702 )
...
* disposal unit now uses a tgui
* Woops, still can't do that
* code review
* curse you tgui
2016-11-25 15:54:02 +13:00
Lzimann
324db72e35
Adds grappa icon and a grappa bottle to booze vending machine.
2016-11-24 23:05:23 -02:00
kevinz000
87dbd65811
[READY]] FLIGHTPACKS (AKA cooler, better, and technological wings with a unique gimmick!) ( #20860 )
...
* vroom
* wew
* a
* b
* morestuff
* .
* a
* .
* .
* basicsprites+extend/retract
* ...
* .
* thanks travis
* woops
* thankstravisv2
* redundence
* ishouldstopmakingsomanygoddamncommits+empdamage
* stuff
* ..
* ion_trails
* fixes_conflict_1
* fix
* compilesnow
* .
* fuck
* WIP: Multi Step Assembly
* thismightfixitthismightnot
* shoe-attachment
* noselfremoval
* wooops
* tweaksandcrashing
* runtimes
* runtimesfuntimes+crash update 1
* thisprobablywontcompile
* stillwip
* githubPLEASEWORK
* fixes conflicts 3/3
* REFACTORSUNTESTED
* fixingconflicts2
* fixingconflicts3/3
* updates
* stuffs
* ...
* stillWIP
* stufffs
* .
* ..
* runtimesfuntimes2
* stuffs2
* conflictfix
* ...
* fuck
* fix
* bah merge conflicts
* knockback_testing1
* conflictfixing...
* mergeconflicts
* plop
* socloseyetsofar
* tweaksandfixes
* conflicts
* fix
* fixes
* fix
* woops
* woops2
* hotfix
* ...
* flufftextandfixes
* test
* ..
* fix1/2
* stuff
* finallysomeoneteachesmehowtofixthisshit
* FIX
* why
* .
* bitflagsshitflags1
* bitflags-shitflags2
* bitflags-shitflags2
* bitflags_shitflags_4
* autofloating
* minerbuffgetthepun?
* notouchingfloors
* ...
* .
* f l o a t
* kek
* kek
* fixes
* fixes2
* sprites
2016-11-25 13:26:43 +13:00
MrPerson
6dc56abd5e
Human nightvision ( #21638 )
...
* Human nightvision
Humans can see in the dark a little bit around themselves.
-Add pictures here-
Forces clients onto 510 and suggests clients upgrade to 511 in the default config. The suggestion is still commented out but forcing clients to 510+ is mandatory.
Ghosts and brains now actually render the default HUD instead of skipping the whole process. Dead mobs will show their fullscreens. All of the existing ones will skip rendering to dead mobs to keep the existing behavior of not rendering the brute/blindness screens.
Fixes #17389
Probably fixes #19248 need to test
* Darker human nightvision it is
2016-11-25 13:05:41 +13:00
oranges
f0806cd368
Merge pull request #21647 from KorPhaeron/buildyourownshuttle
...
Allows captains to organize a shuttle build event
2016-11-25 10:13:53 +13:00
swankcookie
dc65bfdb8d
Adds confirmation message to Latespawn toggle and adds shutter to south bar window ( #21692 )
...
* Adds confirmation message to Latespawn toggle
* Adds a shutter in south bar window
2016-11-25 10:09:47 +13:00
AnturK
e0305a89a1
Merge pull request #21709 from ChangelingRain/belligerentwalk
...
Fixes Belligerent not updating the hud walk/run button
2016-11-24 21:22:30 +01:00
AnturK
133fce1071
Merge pull request #21690 from Shadowlight213/actions
...
Fixes ai restoration start button
2016-11-24 21:19:06 +01:00
Joan Lung
2a01bbbdc5
Clockcult AIs with borgs 'slaved' to them will convert them when hacking via the robotics console ( #21646 )
...
* Clockcult AIs with borgs 'slaved' to them will convert them when hacking via the robotics console
* leeeet's make this more obvious
* "
* this is okay i guess
2016-11-24 21:16:45 +01:00
Mervill
70256e9f8a
Removes some stale comments ( #21700 )
...
* Stale comments and some redundant string interpolation
2016-11-24 13:27:41 -06:00
swindly
7c2780275d
drying rack
2016-11-23 22:22:58 -05:00
oranges
3dfe33dd58
Merge pull request #21688 from MrStonedOne/fuckinghostilesandtheirtypesandlists
...
More typecaching hostile mob targetting
2016-11-24 15:56:44 +13:00
MMMiracles
dc3ff4225c
booties supreme
2016-11-23 17:18:02 -05:00
ExcessiveUseOfCobblestone
bbe6da1a60
"snowy" mapgen now adds snow ( #21681 )
...
* "snow" mapgen now adds snow
* the remie review
2016-11-24 10:30:05 +13:00
oranges
3c7f7582f1
Merge pull request #21680 from KorPhaeron/lavabase2
...
Syndicate Lava Base Remap
2016-11-24 10:28:57 +13:00
Joan Lung
a95660d700
Fixes Belligerent not updating the hud walk/run button
2016-11-23 15:49:26 -05:00
erwgd
76de1e2634
Plasmaman random names ( #21675 )
...
* added list file of plasmaman names to config/names
added var/list that lists plasmaman.txt
added procs for picking and generating random plasmaman names, using plasmaman.txt and roman numerals 1-99
2016-11-23 08:16:01 -06:00
KorPhaeron
e24bc66ecc
You can now see which shuttle is coming in the status panel
2016-11-23 07:07:08 -05:00
KorPhaeron
22e2db3888
Adds the mining conscription kit
2016-11-22 20:01:49 -05:00
XDTM
c132e1d68a
Makes golems different, also fixes a couple of bugs ( #21656 )
...
* Diversifies golems
* Golems
* fixes a bug
* Carbon proc
* Spacing
* oops
2016-11-23 12:42:15 +13:00
GunHog
e3bbce4c6b
Medibot healing fix ( #21677 )
...
When Medibots were switched to charcoal, which lacks and OD threshold,
they were made unable to use it for healing.
2016-11-22 17:24:18 -05:00
oranges
4f9166d3b6
Correct call to addtimer, preventing runtime ( #21661 )
...
All the arguments passed into the arglist appear to be required to not
be named arguments, so this simply strips out the named arguments and
passes them in as the base format.
This is confusing
2016-11-22 17:23:18 -05:00
Shadowlight213
dddcb116af
Fixes ai restoration button
...
Adds an eject button to the restorer UI
2016-11-22 13:01:02 -08:00
Cheridan
c721d6e9fc
Merge pull request #21673 from Cyberboss/patch-1
...
APC grammar fix
2016-11-22 10:46:53 -06:00
MrStonedOne
2aa349a8a1
More typecaching hostile mob targetting
2016-11-22 08:05:47 -08:00
KorPhaeron
8042917954
Fixes bug with baseturf helper
2016-11-21 21:03:51 -06:00
KorPhaeron
3c769285e4
Syndicate Lava Base Remap
2016-11-21 20:37:05 -06:00
swindly
3cd20e06e8
Allows more things to be put in the microwave ( #21650 )
...
* more items can be inserted
* tweaked explosions
* intent
2016-11-22 11:56:02 +13:00
Cyberboss
647570ed37
Fixes #21669
2016-11-21 12:22:21 -05:00
PKPenguin321
14f272c082
reduces cost of throwing weapons box ( #21649 )
2016-11-20 20:41:32 -06:00
Mervill
a072ca8a1e
Fixed a small grammar error in default drone laws
2016-11-20 17:34:49 -08:00
Joan Lung
5224512d55
Replaces Servant cyborg emagged modules with some limited scripture and tools ( #21632 )
...
* Replaces Servant cyborg emagged modules with some limited scripture and tools
* not THAT limited
* sorry standard borg
* bugfix
2016-11-20 17:51:11 +01:00
kevinz000
366e4044fc
joanwhy
2016-11-20 04:13:47 -08:00
Militaires
f2722c995a
Adds a new beard style. Broken Man. ( #21625 )
...
* -electric guitar-
* i've changed, im sorry
* lisa, baby, im sorry.
2016-11-20 14:55:00 +13:00
oranges
6c1966d393
Merge pull request #21612 from KorPhaeron/ssreligion
...
Ssreligion
2016-11-20 14:54:12 +13:00
oranges
f12a75f2cf
Merge pull request #21616 from KorPhaeron/fireproof
...
Adds missing fire proof status to some items (Mining suit and paranormal hardsuits)
2016-11-20 14:54:02 +13:00
oranges
b5e898ce4c
Merge pull request #21615 from KorPhaeron/dragon_form
...
Changes to drake transformation
2016-11-20 14:52:46 +13:00
oranges
1e592f0e06
Merge pull request #21614 from Cruix/not_ling_chat_fix
...
[s] Fixed being able to speak while unconscious using alien or changeling channels
2016-11-20 14:52:28 +13:00
swindly
2d503675d2
Adds nitrous oxide reagent ( #21608 )
...
* Adds liquid nitro
* other reagent
* removes duplicate
2016-11-20 14:51:46 +13:00
KorPhaeron
b3baa8314c
Build your own shuttle
2016-11-19 15:28:25 -06:00
oranges
3f667205e8
Merge pull request #21611 from Cruix/grass_fix
...
Fixed grass on the ground giving too much astroturf
2016-11-19 22:35:17 +13:00
Incoming5643
0f3b7d459e
Adds the warp whistle and summon magic 2016 ( #21599 )
...
* Adds the warp whistle, and updates summon magic
* spelling counts
* Changes things up to account for qdeletion
* Don't code in the web editor
2016-11-19 22:31:42 +13:00
coiax
ef42272bf6
Mice no longer spawn on grilles ( #21603 )
...
* Mice no longer spawn on grilles
Fixes #21574 . Mice no longer spawn on cables that have dense objects
also on the tile.
Also added the Mice Migration event, used for debug purposes, currently
disabled.
* Uses proc that exists to check for density
2016-11-19 22:28:41 +13:00
KorPhaeron
594e34576e
Syndicate Lavabase Ruin ( #21550 )
...
* Syndicate Base
* Secret Base
* Forgot a file
* Gives the base red floors and syndie walls
* Fixes compile errors
* Makes sure you can't steal the bombs
* Adds some uranium
2016-11-19 13:44:34 +13:00
