Commit Graph

18407 Commits

Author SHA1 Message Date
Cyberboss
53fe74fd6f Tgui cleanup 2016-11-27 18:09:45 -05:00
Jordie
d5bff39b71 Merge pull request #21786 from optimumtact/litanyoffailures
Fixes all remaining addtimers missed
2016-11-27 21:47:44 +11:00
oranges
0b7ceca654 Merge pull request #21769 from erwgd/PmanRandnameFix
Plasmaman random name adjustments
2016-11-27 23:08:49 +13:00
oranges
1f5889303d Merge pull request #21753 from ChangelingRain/quickbindmore
You can now quickbind up to 5 scriptures
2016-11-27 23:05:50 +13:00
oranges
1a7d34c887 Merge pull request #21767 from Shadowlight213/tabletgc
More modular computer gc fixes
2016-11-27 23:01:02 +13:00
Xhuis
118fca35b8 Cleanup on aisle 892 (#21745)
* Plastic explosives now delete upon suicide

* Removes some old code

* Allows resisting out of straight jackets

* Verifies roller bed dock functionality

* Fixes lava's article

* Fixes Syndicate pinpointers being stuck to one mode

* Addresses some of @phil235's concerns

* Removes the Highlander left standing message
2016-11-27 22:59:34 +13:00
oranges
af7e6d1323 Fixes all remaining addtimers missed 2016-11-27 08:31:07 +00:00
PKPenguin321
0759c4d83d REMOVES THE FUCKING COMMA (#21768) 2016-11-27 01:22:10 -05:00
Joan Lung
21dfa3af4b Merge pull request #21760 from lzimann/earlyxmasdecorations
Makes x-mas trees automatically spawn
2016-11-26 19:38:37 -05:00
Lzimann
68be7b1b16 Removes code from xmas celebrate() and move to the appropriate holiday datum. 2016-11-26 21:36:55 -02:00
Joan Lung
aa0629df04 Merge pull request #21730 from tgstation/optimumtact-patch-1
Fix runtime with rupees
2016-11-25 21:23:39 -05:00
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
erwgd
a428559a30 plasmaman/random_name gets gender parameter
Moved Rand Roman from random plasmaman name proc to plasmaman_name proc
2016-11-26 00:41:10 +00:00
Shadowlight213
d0f02a0832 nulls the physical var for the modular computer on destroy 2016-11-25 15:16:50 -08:00
Shadowlight213
e7f5e1b136 Fixes addtimer for doors on shuttles 2016-11-25 14:41:32 -08:00
Lzimann
2e8ef6c356 Adds the spawner to the maps 2016-11-25 19:25:48 -02:00
Lzimann
89a03ef577 Adds a new spawn xmas tree landmark and also adds a new holiday, the festive season. 2016-11-25 19:01:53 -02: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
Joan Lung
f89932bb38 You can now quickbind up to 5 scriptures 2016-11-24 21:59:36 -05: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
f0c636dba3 Fix runtime with rupees
This enforces the item crossing them is actually a mob
2016-11-25 10:21:19 +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