3a96d9bd8c
No delay on examining objects with a nanoui interface as a ghost
2015-12-02 22:53:33 -05:00
bfe4d41554
Merge pull request #13408 from neersighted/hotfix
...
Hotfix for SStimer lag
2015-12-03 14:34:45 +11:00
4705037955
Merge pull request #13358 from neersighted/map_name
...
Add map_name to areas
2015-12-03 14:18:34 +11:00
6ec257c360
Hotfix for SStimer lag
...
SStimer can now check dupes
Also fix ghosts not being inquisitive with objects...
2015-12-02 21:23:45 -05:00
dd768b9046
Merge pull request #13369 from neersighted/caps
...
Capitals for Tank logging
2015-12-02 19:09:30 -06:00
08a8115790
Merge pull request #13271 from KorPhaeron/new_mining_turfs
...
New mining turf sprites
2015-12-02 18:11:46 -06:00
056dfe51f3
Makes buttons work on away missions
...
Makes spawned buttons simplier to use
2015-12-02 23:55:42 +01:00
f634890457
Merge pull request #13335 from Incoming5643/fudge_dice
...
Fudge dice
2015-12-02 16:40:25 -06:00
4b7b8a0e94
Adds Bots to Diagnostic HUDs
...
- Adds bots to the Diagnostic HUD.
- Fixes mode tracking issues with AI's botcall interface
- Added Sentience tracking to bots in PDA and AI displays
- New HUD sprites by WJohnston
- Moved bot defines to its own file so it can be used properly.
2015-12-02 16:16:33 -06:00
f4fb0f2886
Fixed the message alert on the librarian's PDA.
2015-12-02 13:33:41 -08:00
fd5423e0cc
Merge pull request #13340 from KorPhaeron/oxy_tank
...
Internals start at 16 pressure
2015-12-02 14:16:29 -06:00
3693759187
Correct crayon comment
...
For /obj/item/toy/crayon , uses == 0 means a mundane crayon has been used up.
Uses < 0 implies unlimited uses.
2015-12-02 11:38:38 -06:00
a1bfb37f0c
Tweaks lighting some more.
...
This should be ready to go.
2015-12-02 07:12:37 -08:00
29d1684757
Merge pull request #13343 from GunHog/L2TestNoob
...
Fixes inability to upgrade gun rechargers
2015-12-02 14:16:34 +00:00
d909c1e82d
Merge pull request #13348 from neersighted/spooky_nanoui
...
Allow ghosts to use any NanoUI interface.
2015-12-02 14:15:33 +00:00
3ef452d8c3
Shooting while adjacent to barricade
2015-12-02 02:36:32 -06:00
ae54bedc30
Merge pull request #13345 from neersighted/sstimer_lovin
...
Fix up SStimer, make Crew Console use SStimer
2015-12-02 15:53:53 +11:00
0b1aa47adc
Adds in-hand sprite to transfer tank valve.
2015-12-02 06:23:55 +02:00
ee522d61d7
Merge branch 'master' of https://github.com/tgstation/-tg-station into fewinhandsprites
2015-12-02 06:05:40 +02:00
b7ad1452ed
Caps for Tank logging
2015-12-01 18:48:35 -05:00
77b36e2415
iced windows, more ice variants of shit in general.
...
more stuff, ice everything.
wew
conflict fix
2015-12-01 16:45:09 -05:00
d616885241
Merge pull request #13338 from Incoming5643/tis_the_season_for_horrible_manual_placement
...
[Touching all the maps oh god] The reason for the season
2015-12-01 15:15:49 -06:00
bf530cc3dd
Fixes untouchable windows
...
Sorry about that. Fixes #13354
2015-12-01 11:54:09 -05:00
091acb5b6e
Removes the |~| string work around, as apparently the problem it was fixing doesn't actually exist.
2015-12-01 11:41:40 -05:00
c36b70afe0
Fix up comments
2015-12-01 10:37:37 -06:00
8cc3a856a2
Add map_name to areas
...
Fixes #12713
2015-12-01 10:03:03 -06:00
8df0899f57
I don't think this is actually needed for whatever reason, but lets be safe.
2015-12-01 03:12:55 -05:00
716ed77501
Changes up how OOC checks to see that you agreed that a message isn't accidental IC.
...
It now passes a special string, "|~|", in front of your message and runs it through OOC again. The string saves the message from further scrutiny, and is then cut off.
2015-12-01 03:07:34 -05:00
6f098e8298
Allow ghosts to use any NanoUI interface.
2015-11-30 23:34:59 -05:00
47e9a7771a
Fix up SStimer, make Crew Console use SStimer
...
Remove crappy proc queue as well...
2015-11-30 20:56:45 -05:00
c09b880fa4
Fixes inability to upgrade gun rechargers
...
Adds missing exchange_parts() proc
2015-11-30 19:54:41 -06:00
16303c1c1f
Changes flag name from ABSTRACT to NODECONSTRUCT
...
Removes holo-tables and holo-windows since those typepaths are no longer needed.
Updates Z2 to reflect this. Removes spurious tag tags in Z2.
2015-11-30 20:26:03 -05:00
42da16a003
adds swankcookie's snowman stuff to the gifts that will spawn on christmas should the trees exist which hopefully they will!
2015-11-30 19:21:53 -05:00
c29f2ef837
Internals start at 16 pressure
2015-11-30 18:12:32 -06:00
b31b5e3f77
Fix Conflicts:
...
code/game/machinery/doors/windowdoor.dm
2015-11-30 18:56:43 -05:00
6be3a6fd58
Cleans up copypaste but this time it compiles
2015-11-30 16:50:17 -06:00
fab3cdc3a2
Cleans up copypaste, adds missing block chances
2015-11-30 16:39:02 -06:00
2609adb29d
Blocking overhaul
2015-11-30 16:22:31 -06:00
d8f6039834
Accidental remnant of another pull got in
2015-11-30 15:22:58 -05:00
0c1d7272d5
Adds fudge dice
...
They're six sided dice with two pluses, two minusii, and two blank sides.
They're also a jokey recipe you can create with any dice and a chocolate bar. Once you eat the literal fudge die you get a fudge die no matter what kind of die you used into its creation. This is INTENTIONAL AND PART OF THE JOKE.
Adds them to the "rare dice" spawn in dice bags.
Formally defines a d6 as a separate thing from the generic parent die. the generic parent die is still a d6 for all intents and purposes except for the fact that it's now just called a generic "die" instead of a d6. This was so the recipe didn't list a d6 as needed for the fudge dice recipe when really any die would do.
Doesn't replace existent generic die with d6eses on the maps because I don't want this to conflict for a million years. I'll swap out the generic dies at some future point after this is added.
2015-11-30 15:19:25 -05:00
75f87f370f
Added template and some tweaks.
2015-11-30 14:16:05 -05:00
78c95ab035
Merge pull request #13317 from neersighted/airlock_electronics
...
NanoUI Airlock Electronics
2015-11-30 20:43:33 +03:00
5b170c8bc0
4am will do that to ya
2015-11-30 04:25:20 -05:00
7de857b476
Upgrades the space heater!
2015-11-30 04:11:10 -05:00
ad410e39d8
Merge pull request #13296 from neersighted/nanoui_checks
...
Fix some NanoUI checks
2015-11-29 18:36:18 -06:00
05ae680b06
Fixing conflicts:
...
code/game/machinery/computer/computer.dm
code/game/machinery/doors/windowdoor.dm
code/game/objects/structures/window.dm
2015-11-29 19:02:30 -05:00
06e5df9336
Fix NanoUI missing assignment; use two-line ifs
2015-11-29 18:20:10 -05:00
4fb081826f
shh
2015-11-29 15:55:26 -05:00
e6cfba70a2
iced variant of regular walls added
2015-11-29 15:45:22 -05:00
a2bcbf5db7
Merge pull request #13279 from tkdrg/PUTTING_YOUR_VARS_IN_A_POOL
...
Ports the /vg/ pooling resetVars by Clusterfack
2015-11-29 23:36:07 +03:00
Nerd Lord
Jordie
Bjorn Neergaard
Cheridan
AnturK
GunHog
spudboy555
duncathan salt
octareenroon91
MrStonedOne
Remie Richards
KorPhaeron
kingofkosmos
MMMiracles
Vincent
Incoming5643
Incoming
YotaXP
Razharas