Commit Graph

10033 Commits

Author SHA1 Message Date
Aurorablade
a2d6591d29 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into STILLALOTOFBLOOD 2015-07-08 18:16:25 -04:00
ZomgPonies
737eb44b04 Merge pull request #1471 from Fox-McCloud/destroy-them-all
Destroy Pass II
2015-07-08 02:25:03 -04:00
ZomgPonies
8d5d97bd45 Merge pull request #1468 from SamCroswell/computerupdate
Computer Lighting Update
2015-07-08 02:23:58 -04:00
Fox-McCloud
6e87b96501 Pass 3 2015-07-08 01:34:53 -04:00
Fox-McCloud
0fd80d0b1f pass one fix 2015-07-08 01:09:10 -04:00
Fox-McCloud
9dc27ce126 Destroy Pass II 2015-07-07 22:26:28 -04:00
TheDZD
b02cd94168 Merge pull request #1467 from Fox-McCloud/del-the-dels
Replaces Remaining Del()'s
2015-07-07 19:07:53 -04:00
TheDZD
db8767265a Merge pull request #1461 from Fox-McCloud/singulo-equipment
Singulo Equipment Cleanup and Fixes
2015-07-07 19:07:12 -04:00
TheDZD
e48de984c4 Merge pull request #1453 from Fox-McCloud/job-selection
Adjusts Character Setup and Job Selection Menus
2015-07-07 19:07:07 -04:00
Fox-McCloud
40c047f89a Merge pull request #1464 from tigercat2000/gibtoy
Minigibber toy
2015-07-07 16:35:36 -04:00
SamCroswell
0dbfc3bd04 Crystals now eject at the bottom of a computer 2015-07-07 02:28:54 -04:00
SamCroswell
d9a76bef17 GPS now goes in the hand 2015-07-07 02:18:11 -04:00
SamCroswell
f7cc10aae5 Telesci / Poly Update 2015-07-07 02:10:54 -04:00
Fox-McCloud
561e0c2268 pass 3 and cleanup 2015-07-07 01:32:40 -04:00
SamCroswell
1d670c4c0f Computer Lighting Update 2015-07-07 01:10:55 -04:00
Fox-McCloud
a9f3eab669 pass 2+fix 2015-07-07 00:58:34 -04:00
Fox-McCloud
88dfaa51a4 Replaces Reamining Del()'s 2015-07-07 00:35:19 -04:00
Fox-McCloud
b9a492a3a5 no world 2015-07-06 23:25:29 -04:00
Krausus
d694ad1d09 Inverts new karma reminder and scoreboard toggles
These can't default to 1, or they'll have the wrong default for every
existing player.
2015-07-06 23:07:04 -04:00
ZomgPonies
fcc6b76440 Merge pull request #1458 from TheDZD/fluff
MrBarrelrolll Fluff Item
2015-07-06 22:04:12 -04:00
Tigercat2000
997d616b62 Minigibber toy
This commit adds a miniature gibber toy (/obj/item/toy/minigibber), which
uses a downscaled sprite of the gibber.

Features:
 - Plays a gibbing noise when you click on it with itself, cooldown of 8
   ticks applies.
 - It's a miniature gibber.
 - Custom attack verbs (grinded, gibbed)
 - Feed DnD minifigures into it for REALISTIC GIBBING ACTION (tm)
 - Obtain from arcade machine or cargo store (400 credits)

** SQUASHED COMMITS **

Minigibber name-spellchecking

Protip: Miniature is actually spelled mini-ature, not min-ature.

Minigibber minifigure eating action!

You can now shove minifigures into the Minigibber, then click on it with
itself to tear them apart! GIB! GIB! GIB!

Make minigibber obtainable

Via arcade machine and cargo store (400 credits)

Minigibber desc now says grinder...

instead of meat producing machine. Because it's really just a giant
grinder, and that will match the store item description.

Readd gibbing sound to minigibber, mistakenly removed it earlier.
2015-07-06 17:15:54 -07:00
Tigercat2000
3a45d52fe0 Fix remaining non-returning Destroys()
Plus a little refactor to mining flaps and spacepod doors- they now use
CanAtmosPass instead of manually setting the turf to no-atmos-passing
2015-07-06 09:20:39 -07:00
Fox-McCloud
3a44b3097f Singulo Equipment Cleanup 2015-07-06 01:07:08 -04:00
TheDZD
226324595c Merge pull request #1444 from Fox-McCloud/round-end-toggles
Scoreboard and Karma Toggles
2015-07-05 17:51:38 -04:00
TheDZD
b38d741801 Merge pull request #1446 from Fox-McCloud/pools-and-fires
Pools Hotspots
2015-07-05 17:51:20 -04:00
TheDZD
893e5a91c9 Merge pull request #1449 from Fox-McCloud/side-effects
Removes Unused/Non-functional Medical Side-Effects
2015-07-05 17:51:09 -04:00
TheDZD
59b154e8cb Merge pull request #1452 from Fox-McCloud/parents-and-procs
Tweaks a Few Destroy()'s
2015-07-05 17:51:03 -04:00
DZD
136a81664a MrBarrelrolll Fluff Item
- Adds in fluff item for MrBarrelrolll, a replica claymore.
2015-07-05 17:39:32 -04:00
Fox-McCloud
32b991c6b8 Merge pull request #1447 from PJB3005/CARPET
Fixes fucked up lights on carpets and the alike.
2015-07-05 17:19:25 -04:00
Fox-McCloud
1804586fbd Adjusts Character Setup and Job Selection Menus 2015-07-05 08:48:30 -04:00
Aurorablade
372680f62c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into STILLALOTOFBLOOD 2015-07-05 06:48:39 -04:00
Fox-McCloud
44881a4016 Tweaks a Few Destroy()'s 2015-07-05 04:51:47 -04:00
TheDZD
d8c3ff71dc Merge pull request #1442 from Fox-McCloud/dreaming
Dreams Refactor
2015-07-04 21:50:16 -04:00
TheDZD
547373b55f Merge pull request #1450 from Fox-McCloud/emitter-pooling-fix
Fixes Emitter Beam Pooling
2015-07-04 21:50:03 -04:00
Fox-McCloud
6610d71dd7 Fixes Emitter Beam Pooling 2015-07-04 20:59:12 -04:00
Fox-McCloud
ab28186d13 Kill is Kill 2015-07-04 19:27:43 -04:00
Fox-McCloud
650580c0b6 Removes Unused/Non-functional Medical Side-Effects 2015-07-04 18:10:44 -04:00
PJB3005
c860c76e4a Should fix #1401 2015-07-04 17:33:31 +02:00
TheDZD
8d32489565 Merge pull request #1438 from Fox-McCloud/black-powder-balance
Black Powder Balance
2015-07-04 10:08:18 -04:00
TheDZD
b904fc4fb5 Merge pull request #1434 from Fox-McCloud/analyzer-refactor
Analyzer Scan Refactor
2015-07-04 10:07:57 -04:00
Fox-McCloud
a878ccee30 Pools Hotspots 2015-07-04 09:34:03 -04:00
Fox-McCloud
630a04c577 Scoreboard and Karma Toggles 2015-07-04 04:47:57 -04:00
Fox-McCloud
9fd889dbca Dreams Refactor 2015-07-03 17:42:26 -04:00
Fox-McCloud
3cea706688 Black Powder Balance 2015-07-02 17:46:24 -04:00
Aurorablade
70859356b1 Remove a debug print
one line, i am sure i missed others. Always miss that ONE Debug print.
2015-07-02 16:16:07 -04:00
Aurorablade
5f44c389ff Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into STILLALOTOFBLOOD 2015-07-02 15:57:16 -04:00
Fox-McCloud
6fd8d83f4b Merge pull request #1431 from tigercat2000/bayholder
Update mob holder code to bay's modular system.
2015-07-02 14:42:14 -04:00
Fox-McCloud
389eab6e32 Analyzer Scan Refactor 2015-07-02 02:01:13 -04:00
ZomgPonies
7df2c7e71d Merge pull request #1427 from Fox-McCloud/supermatter
TG Supermatter Port
2015-07-01 23:49:19 -04:00
Fox-McCloud
4820fc7065 Merge pull request #1433 from FalseIncarnate/master
Grinder Fix, Botany qdel Refactor, Removes PanDEMIC 2200
2015-07-01 22:25:52 -04:00