 ChuckTheSheep
|
0bba6f4fae
|
Merge remote-tracking branch 'upstream/master' into Morgue-Slab-Fix
|
2014-02-25 20:21:21 -05:00 |
|
 Rockdtben
|
9a2426a219
|
Merge pull request #2903 from hornygranny/harmyeller
Removes pAI radio
|
2014-02-25 17:19:11 -06:00 |
|
|
ChuckTheSheep
|
87a22a4f15
|
Actually Fixed Say
|
2014-02-25 17:17:43 -05:00 |
|
|
ChuckTheSheep
|
2a69810663
|
WIP
|
2014-02-25 15:48:23 -05:00 |
|
|
ChuckTheSheep
|
fd8cd6ebc3
|
Fixes Speaking, Whoops
|
2014-02-25 13:38:06 -05:00 |
|
 Aranclanos
|
0110a571d7
|
Merge pull request #2884 from Incoming5643/Clockwork
fixes #2881
|
2014-02-25 09:40:01 -02:00 |
|
 AlexanderUlanH
|
7de04b6c3c
|
Merge branch 'master' into spaceareas
|
2014-02-24 17:47:19 -05:00 |
|
 Cheridan
|
ded7b01f5f
|
Merge pull request #2829 from Razharas/LifeLikeTexture
Autolathe improvements
|
2014-02-24 16:27:16 -06:00 |
|
 Incoming
|
2ba44444f8
|
Swaps the fix for the one suggested
|
2014-02-24 17:18:26 -05:00 |
|
|
Cheridan
|
0484924e95
|
Merge pull request #2882 from Miauw62/diojagijasdgjisagopagpjsagpoagpjga
Fixed #2880 horse mask removable
|
2014-02-24 15:57:39 -06:00 |
|
|
Cheridan
|
6f7b75f38c
|
Merge pull request #2895 from Incoming5643/prettypatties
[map] Pretty Patties
|
2014-02-24 15:51:45 -06:00 |
|
|
Cheridan
|
ff08e7c557
|
Merge pull request #2893 from Miauw62/gurehibjkogtirfhdgyf(ihgufhygdfrgjihkigfjuhygdfhijgufhygdhufrg
Fixed more NODROP runtimes
|
2014-02-24 13:43:33 -06:00 |
|
 hornygranny
|
0dc364a6b1
|
Removes radio from pAI
|
2014-02-24 10:44:26 -08:00 |
|
|
ChuckTheSheep
|
5899b02573
|
New Recursive Check
|
2014-02-24 12:48:54 -05:00 |
|
|
Aranclanos
|
217132efa6
|
Merge pull request #2877 from Incoming5643/boltbgone
Bolt of animation fix
|
2014-02-24 15:03:06 -02:00 |
|
|
Aranclanos
|
b64ba5ba1e
|
Merge pull request #2887 from Giacom/statue_fixes
Silicons no longer stop statues from being able to move.
|
2014-02-24 14:59:00 -02:00 |
|
|
Aranclanos
|
3ed265da51
|
Merge pull request #2790 from Jordie0608/lookintothejawsofhell
Updated SSU sprites and update_icon proc
|
2014-02-24 14:29:46 -02:00 |
|
 Razharas
|
0a8e8a6b3e
|
Merge pull request #2843 from MrPerson/its_a_beeeeeeeeeeeeaaaaaaaarrrr!!!!!
Standardized space bears.
|
2014-02-24 08:07:48 -08:00 |
|
|
Aranclanos
|
86cf992202
|
Merge pull request #2866 from hornygranny/violinsamples
Violin de-headaching
|
2014-02-24 14:07:24 -02:00 |
|
|
Aranclanos
|
90fe98402c
|
Merge pull request #2890 from Razharas/TeleSci
Telescience fix
|
2014-02-24 14:04:59 -02:00 |
|
|
Razharas
|
98168cd705
|
Merge pull request #2854 from Incoming5643/oreroom
[map] Mineral Storeroom
|
2014-02-24 08:04:11 -08:00 |
|
|
Razharas
|
94907b1311
|
Merge pull request #2839 from Aranclanos/BloodReagent
Blood runtimes fix.
|
2014-02-24 07:56:39 -08:00 |
|
|
Razharas
|
d8f12f0680
|
Merge pull request #2836 from Cheridan/hydro
Drying Rack as smartfridge
|
2014-02-24 07:56:17 -08:00 |
|
|
Razharas
|
3d90e8815e
|
Merge pull request #2827 from Ergovisavi/muh_vision
Adding NVG's/Advanced Mesons to the protolathe, some human vision changes
|
2014-02-24 07:55:34 -08:00 |
|
|
Razharas
|
00512ba146
|
Merge pull request #2805 from rymd/somatoray
Floral somatoray requires radium instead of uranium
|
2014-02-24 07:54:39 -08:00 |
|
|
Incoming
|
58f871ca25
|
By sticking a crayon in the mix when making a burger you can now make a colored burger!
Standardizes burger code to end the madness of there being like 30 different burgers that have the same damn thing in them.
|
2014-02-23 18:34:32 -05:00 |
|
|
ChuckTheSheep
|
d3b9ec2271
|
Fixes an oversight in my slab code
Initial code now works as intended, did not realize the recursive mob
check was looking for clients, now it looks for any mobs.
|
2014-02-23 17:33:13 -05:00 |
|
 Miauw
|
f75692ceed
|
Fixed more NODROP runtimes
|
2014-02-23 19:34:49 +01:00 |
|
|
Miauw
|
2a7f688d90
|
Fixes a NODROP runtime.
|
2014-02-23 19:20:27 +01:00 |
|
|
Miauw
|
ef1710a058
|
Fixed horsemasks properly
|
2014-02-23 19:01:35 +01:00 |
|
|
Aranclanos
|
e6c856e456
|
Merge pull request #2803 from Rockdtben/SyndCardDesc
Synd card desc
|
2014-02-23 13:46:10 -02:00 |
|
 Jordie0608
|
f658c62a05
|
Changed to work with overlays
|
2014-02-24 01:55:54 +11:00 |
|
 Razharas
|
84e1d9872e
|
Telescience fix
Fixes infinite telecrystals from telescience
I tested most of the computers and they were good
No idea who put initialize into new and why
|
2014-02-23 16:54:52 +04:00 |
|
|
Cheridan
|
a154fb0826
|
Merge pull request #2876 from Razharas/Abloblo
Another fix for dept sec
|
2014-02-22 23:54:21 -06:00 |
|
|
Cheridan
|
e306f40647
|
Merge pull request #2870 from Aranclanos/ReagentCodeSpawn
Removed some spawn(0) calls from the reagent code, fixes runtimes.
|
2014-02-22 23:39:35 -06:00 |
|
|
Cheridan
|
8b31314cb7
|
Merge pull request #2806 from Incoming5643/implantsmorelikeshitplants
Improves the "freedom" syndicate bundle
|
2014-02-22 23:33:49 -06:00 |
|
|
Cheridan
|
c91a3a1ed5
|
Merge pull request #2856 from Giacom/wiki_manuals
[MAP] Added a new wiki manual subtype which will allow you to easily add new book/manuals which link to the wiki.
|
2014-02-22 23:28:04 -06:00 |
|
 Giacomand
|
916e7c9ec3
|
Silicons no longer stop statues from being able to move.
Added a variable that will allow you to have the statues move while seen.
|
2014-02-22 22:22:02 +00:00 |
|
|
Cheridan
|
89170dd6d9
|
Merge pull request #2867 from Aranclanos/hardestfix
Smoke effect runtime fix.
|
2014-02-22 13:12:11 -06:00 |
|
|
Cheridan
|
aa52d1ed99
|
Merge pull request #2869 from Aranclanos/DragAndDropNotDragAndSpawn
removes a spawn() from the MouseDrop() proc
|
2014-02-22 13:02:31 -06:00 |
|
|
Cheridan
|
b723f68979
|
Merge pull request #2868 from Aranclanos/StopThinkingBrain
Stops brains generating runtimes by toggling throw mode
|
2014-02-22 12:58:36 -06:00 |
|
|
Incoming
|
03fd5779a1
|
fixes #2881
|
2014-02-22 13:44:29 -05:00 |
|
|
Aranclanos
|
b44c6ffdf9
|
Merge pull request #2801 from Razharas/Vendors
Vendor fixes and stuff
|
2014-02-22 14:22:11 -02:00 |
|
|
Aranclanos
|
98c4f5adbf
|
Merge pull request #2871 from Razharas/RuntimeFix2
Fixed mech grenade prime runtime
|
2014-02-22 11:52:32 -02:00 |
|
|
Aranclanos
|
3c0c8c15a9
|
Merge pull request #2872 from Razharas/RuntimeFix3
Fixed helper proc not checking the targer.current
|
2014-02-22 11:52:26 -02:00 |
|
|
Aranclanos
|
18d4bbe736
|
Merge pull request #2873 from Razharas/RuntimeFix4
Fix for runtime after spawn in diseases
|
2014-02-22 11:52:14 -02:00 |
|
|
Aranclanos
|
db8f4b66f5
|
Merge pull request #2874 from Razharas/RuntimesFix
DNA and R&D console runtimes fix
|
2014-02-22 11:52:07 -02:00 |
|
|
Miauw
|
8f6be71f1e
|
Fixes being able to take horsemasks off
|
2014-02-22 12:51:45 +01:00 |
|
|
Rockdtben
|
e591d8099e
|
Merge pull request #2859 from hornygranny/gibtonitelog
Fixes #2783
|
2014-02-21 20:42:49 -06:00 |
|
|
Rockdtben
|
8af22aeeac
|
Merge pull request #2861 from hornygranny/muhspans
Fixes #2726, #2729
|
2014-02-21 20:39:58 -06:00 |
|