Commit Graph

2981 Commits

Author SHA1 Message Date
FalseIncarnate
fca3996fcb Cigarette Pack Functionality
Adds the ability to put cheap lighters and individual matches into
cigarette packs at the cost of cigarette slots.
- A cheap lighter takes up the space of 2 cigarettes
- Zippos won't fit, they are too boxy.
- A match takes up the space of 1 cigarette.

Increases the w_class of all lighters (cheap, zippo, and special zippos)
from 1 to 2
- Still fits in pockets, just can't shove as many into a box as they
take up more space

Adds the ability to light and put out matches on your shoes.
- Good for when you lose that matchbox (or shove matches into a cig
pack) and need a light.
- Works on all shoes, from the humble brown shoes to the devious
syndicate magboots, and even the clown shoes.

Based on the suggestion from:
http://nanotrasen.se/phpbb3/viewtopic.php?f=12&t=6880
2016-01-19 02:49:00 -05:00
Fox-McCloud
b4244b3921 Fixes Some Items Attacks 2016-01-18 01:25:10 -05:00
Fox-McCloud
ff9acaf730 Merge remote-tracking branch 'upstream/master' into implant-refactor 2016-01-16 20:52:36 -05:00
Fox McCloud
9e55d11fa9 Merge pull request #3178 from Aurorablade/insertlewdcommenthere
try to fix mindslave implant hud
2016-01-16 20:39:57 -05:00
Fox-McCloud
4558e0e8ae better pad 2016-01-16 19:48:13 -05:00
Aurorablade
f40daffbe8 I FIXED IT 2016-01-16 15:50:43 -05:00
Fox-McCloud
8c229280d2 consistency helps 2016-01-16 04:44:56 -05:00
Fox-McCloud
ec350a0b5c TG Implant Refactor/Overhaul 2016-01-16 01:50:10 -05:00
Aurorablade
28a2980110 HALP HALP 2016-01-14 14:56:56 -05:00
Crazylemon64
de13a4e4d3 Various Ragin' Mages fixes
* Additionally, increases the number of memes in the codebase
2016-01-13 21:56:56 -08:00
Aurorablade
53222772bc i almost want to give up on this 2016-01-13 03:37:45 -05:00
Aurorablade
602d4c1c2f what am i even doing... 2016-01-12 16:22:42 -05:00
Fox McCloud
a2f944cfd9 Merge pull request #2722 from ZomgPonies/russian
Revolver Stuff
2016-01-11 00:18:21 -05:00
Fox-McCloud
df75c3418d tweak 2016-01-09 21:19:20 -05:00
Fox-McCloud
a2e825603e Adds in Tradable Telecrystals 2016-01-09 17:42:03 -05:00
TheDZD
82b12d1a34 Merge pull request #3164 from Fox-McCloud/uplink-fixes
Uplink and Syndicate Cyborg Fix
2016-01-08 17:28:40 -05:00
Fox-McCloud
a21d1b5221 Uplink and Syndicate Cyborg Fix 2016-01-08 17:07:33 -05:00
Fox McCloud
96f38d0ccd Merge pull request #3120 from Tastyfish/nano-piano
Instrument UI updated to modern nanoui.
2016-01-06 03:45:43 -05:00
Tigercat2000
986c687d27 Merge remote-tracking branch 'upstream/master' into lighttiles
Conflicts:
	code/game/objects/items/stacks/tiles/tile_types.dm
2016-01-05 18:49:36 -08:00
Tigercat2000
a10d7d1bd2 fix lightfloors 2016-01-05 18:46:39 -08:00
TheDZD
3d316d9c66 Merge pull request #3116 from Fox-McCloud/slipping-floors
Slippery Refactor and Floors
2016-01-05 21:42:26 -05:00
TheDZD
73f6114b1f Merge pull request #3112 from Fox-McCloud/object-verb-restore
Restores a Few Object Verbs
2016-01-05 19:35:55 -05:00
Tastyfish
65e2a7fdff Updates/fixes instrument ui to be a nanoui 2016-01-05 02:26:45 -05:00
Fox-McCloud
4221d033ab Slipping Refactor and Floors 2016-01-04 21:22:59 -05:00
Fox-McCloud
a7d1bcce4e Restores a Few Object Verbs 2016-01-04 16:42:53 -05:00
Crazylemon
b06d542d50 Fixes a flipped conditional that made welders unreadable 2016-01-04 10:10:50 -08:00
Fox McCloud
103372e92b Merge pull request #3037 from KasparoVy/master
Adds Body Marking Customization, Head Accessories, Revises Unathi Customization, Related Minor Fixes, etc.
2016-01-03 22:33:40 -05:00
Fox McCloud
9c863e5259 Merge pull request #3092 from tigercat2000/tgsmooth
-tg- Smoothing/Floor refactor
2016-01-03 22:28:50 -05:00
Tigercat2000
31aab5452b -tg- smoothing/floor refactor
Squashed:

Add plasteel goonplaque turf

Builtin_tile nulling

Levelupdate()

Fix falsewalls, update smoothing.dmm

fixes rwall decon
2016-01-03 19:24:13 -08:00
TheDZD
6ec065b319 Merge pull request #3102 from Fox-McCloud/ert-fix
ERT Medical Belt Fix
2016-01-03 21:38:15 -05:00
Fox-McCloud
dfa55f1f35 ERT Medical Belt Fix 2016-01-03 21:23:49 -05:00
TheDZD
cf77645cc7 Merge pull request #2853 from Regen1/Iamsodone
Nerfs the bag of holding + bag of holding effect
2016-01-03 11:34:08 -05:00
Fox McCloud
fb6f3e05d5 Merge pull request #3060 from RudiPardieck/materials
Material usage fixes
2016-01-01 17:34:44 -05:00
Certh
d69a691840 Dismantling table parts now returns same amount of metal as was used in construction 2015-12-31 12:07:22 +01:00
KasparoVy
eb47c80d75 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2015-12-30 18:16:17 -05:00
KasparoVy
135475332b Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2015-12-30 17:41:26 -05:00
TheDZD
6433e3fc41 Merge pull request #3043 from Fox-McCloud/elite-syndi-hardsuit
Ports Elite Syndicate Hardsuit and Uplink Refactor
2015-12-30 13:49:39 -05:00
Regen
7a51db1f2f keep the !!FUN!!, remove !!ACCIDENT!! 2015-12-29 17:58:19 +01:00
Fox-McCloud
0f03947d55 Ports Elite Syndicate Hardsuit and Uplink Refactor 2015-12-28 08:37:27 -05:00
Tigercat2000
9cb84e83ca Clean old shit, delete old files, move files, mrowl 2015-12-27 15:58:41 -08:00
KasparoVy
6ba20458e5 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
# Conflicts:
#	icons/mob/human_face.dmi
2015-12-27 18:42:59 -05:00
KasparoVy
5f72fff880 Final Pass
Breaks Facial Hair updates into their own proc and puts facial hair on
its own layer.
Works through everything that calls update_hair with the intention of
updating facial hair and adds update_fhair
Fixes the sprite names and colouring on all 'facial' and 'body marking'
aspects.

Fixes/implements proper ID photo/preferences preview picture generation.

To do: Tail marking customization possible rework, gutting in the
meantime
2015-12-27 05:45:25 -05:00
Mark van Alphen
13f2f92624 Merge pull request #2999 from Fox-McCloud/tesla-port-final
Ports TG's Tesla Engine
2015-12-25 16:21:11 +01:00
Fox McCloud
9d8c5ba4fc Merge pull request #3003 from FalseIncarnate/master
Naughty List Revenge
2015-12-24 23:03:35 -05:00
FalseIncarnate
c032781c7b Naughty List Revenge
Santa has refused to deliver presents to the NSS Cyberiad for an unknown
reason.

Meanwhile, a distress beacon is received from the North Pole, on an
unencrypted Syndicate frequency. Apparently, Christmas Eve was anything
but a silent night.

A rogue operative seems to have infiltrated the North Pole and attempted
to coerce Santa into removing him from the Naughty List, but his plans
may have backfired. Santa has finally snapped, and must be put down in
order for the crew to receive their gifts this year.

The gateway has been reconfigured to lock onto the general location of
the distress signal, and will not lock on to any other destinations
until after Christmas has passed. Be warned, however, that the frozen
north is far from hospitable, and a variety of dangers await you beyond
the safety of the blast doors.

This mission will offer some new challenges, and is designed to be
undertaken by a squad of players. Will your team be able to put Father
Christmas to rest and rescue the presents, or will you meet your demise
in the freezing tundra?
2015-12-24 03:40:31 -05:00
Fox-McCloud
5069d949bd Ports TG's Tesla Engine 2015-12-24 00:40:20 -05:00
Fox-McCloud
b8adbee8bb Removes Thanksgiving/Fall Decorations--Adds Christmas Tree 2015-12-23 02:23:04 -05:00
Fox McCloud
82946d8449 Merge pull request #2909 from Spacemanspark/SNAAAAAAAAAAAAAKE
Adds big cardboard boxes.
2015-12-21 22:02:58 -05:00
Spacemanspark
39737e6c05 Adds big cardboard boxes.
!
2015-12-20 15:31:24 -06:00
ZomgPonies
3acff9ccff Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into russian 2015-12-20 06:29:28 -05:00