cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 17:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,166 Commits 26 Branches 2 Tags
ec43741f2fa9263a33196685d813bd5a91bb62cd
Commit Graph

2780 Commits

Author SHA1 Message Date
Zuhayr
7389d843fc Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-21 18:06:49 -07:00
Zuhayr
fa5202c5ed Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-21 18:06:36 -07:00
Zuhayr
a16c8e0595 Fixes #3081 2013-06-21 18:00:25 -07:00
Zuhayr
afece7e56e Fixes #3118 2013-06-21 15:07:31 -07:00
Chinsky
32fd044e52 Merge pull request #3103 from AppleMaster/bleeding-edge-freeze 
I don't know what I broke
 2013-06-20 23:51:30 -07:00
Jim Apples
a23e1c7a92 Added 5 barsigns. 
Signed-off-by: Jim Apples <cheeckan@gmail.com>
 2013-06-19 17:51:41 +01:00
Spamcat
0dfb5a0583 Whoops :/ 2013-06-19 02:58:26 +04:00
Spamcat
6d6becbeed Made hailers emaggable. 2013-06-19 02:35:32 +04:00
Zuhayr
63b3e44b5c Bug fixes for embedding/pinning code. 2013-06-18 21:24:26 -07:00
Segrain
dcf984577a Adding construction of req_one_access doors. 2013-06-18 02:47:24 +03:00
Segrain
91e1e848f7 Bugfixes for windoor construction. 2013-06-18 02:34:15 +03:00
Zuhayr
b1cac56e9a Merge resolution. 2013-06-15 03:54:22 -07:00
Zuhayr
753129086e Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-14 12:01:56 -07:00
Jamini
89766706fe Alien Monkeys - Farwa, Stok, Aenera 
Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-06-14 02:22:27 -04:00
Zuhayr
6b73b8ec2f Adjusted kitchen knives. Added projectile pinning. Various tweaks. 2013-06-13 20:46:09 -07:00
Asanadas
7479fd272c Added Malsquando's colored suit to the hop's wardrobe locker. 
Everything should be working correctly.
 2013-06-13 09:41:52 -04:00
Chinsky
bb26c5a7cb Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into newstuff 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
 2013-06-12 23:11:28 +04:00
Vetinari
3c0a424bb3 Medbay Remap post-ERT 
Medbay Overhaul, mapping post-ERT changes, recommit of previous files
due to computer derp.
 2013-06-12 23:27:36 +10:00
Zuhayr
7cd54ac387 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-12 11:41:08 -07:00
Zuhayr
0a220db976 Added embedded weapons and adjusted implant removal surgery to work with non-implants in organs. 2013-06-12 00:28:12 -07:00
Zuhayr
d0e15b3608 Harpoon, harpoon sprites, removed pneumatic cannon sprites from human.dmi. 2013-06-11 13:15:33 -07:00
Chinsky
bd3879da2e Merge pull request #3040 from Baystation12/master 
hurka durka master update
 2013-06-11 12:25:56 -07:00
Chinsky
09d0bb7f8e Merge pull request #3039 from Furlucis/master 
Typo fixes
 2013-06-11 12:21:16 -07:00
Spamcat
076f4c9d9a Figured I should finally commit it, since exams are over now~ 
Radios start off by default. Should decrease the amount of tcomm lag.
 2013-06-11 23:09:44 +04:00
Furlucis
360bde9f83 Fixed some typos. (feotal, "/red ...") 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-06-11 15:01:48 -04:00
jack-fractal
e3fd232741 - removing yellow and black gloves from the randomized tech storage object 
- adding toolbelts
- rebuilding changes to map
 2013-06-11 00:52:32 -04:00
jack-fractal
245713418f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-06-11 00:29:10 -04:00
Chinsky
6dc2d9d2dc Merge pull request #3015 from comma/master 
Fix
 2013-06-10 11:50:50 -07:00
Zuhayr
bc2db268cc Vox oxygen toxicity, vox breath mask, nitrogen tank for spawning. 2013-06-10 17:16:54 -07:00
jack-fractal
23498c269a - adding random objects 
- randomizing main tool storage starting objects

- randomizing secondary tool storage starting objects
 2013-06-09 18:12:57 -04:00
Chinsky
eaf6b64277 Compile fix. 2013-06-09 19:53:08 +04:00
Chinsky
4118d183c1 No fun allowed. 
Fixes some hilarious stool glitches.
 2013-06-08 05:27:32 +04:00
jack-fractal
29bffb0c20 Merge branch 'master' into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-06-06 21:32:08 -04:00
jack-fractal
17b8a2dc8a - reverting a change I hadn't accounted for to the luminosity of the PDA's flashlight 2013-06-06 20:50:22 -04:00
jack-fractal
f4441b5019 refactoring the Stat function for silicon lifeforms 
adding messenger functions to cyborgs and refactoring the AI's IM system
 2013-06-06 20:46:46 -04:00
Chinsky
466f930e63 Merge pull request #2982 from Zuhayr/master 
Vox icons, stuff from master.
 2013-06-06 02:35:49 -07:00
Zuhayr
df75d25cb3 Map conflict, using BEF. 2013-06-06 10:40:22 +09:30
MisterBook
eab6f4fc44 Taser fix v.3.2 
Now accounts for multiple layers of armor.

I've also commented out Vox stuff, while Zuhayr fixes it. Because, no compile.

I also fixed whistle.dm
 2013-06-05 19:37:29 -05:00
Chinsky
211fc25f0d Should probably slap it here, OR ELSE. 2013-06-05 21:58:27 +04:00
Chinsky
cfbc3e5352 Added webbing and vests to lockers. 2013-06-05 21:35:56 +04:00
Chinsky
57c1ebb285 Merge pull request #2977 from MagmaRam/master 
Fix for security belts not holding all seven items sometimes
 2013-06-05 06:21:47 -07:00
MagmaRam
ae697179c9 Fix for security belts not holding all seven items if the total combined w_class of the items is over 14. They should now be able to hold seven of any items that fit in them. 2013-06-05 20:14:11 +07:00
Zuhayr
9e71180e1b Merge conflict resolution, using BEF. 2013-06-05 14:22:04 +09:30
meyar
11ae345509 Nerfs the PDA flashlight to make the ACTUAL flashlight a viable option. 2013-06-04 18:34:43 -04:00
Spamcat
c5a57ccdc4 Runtime fixes, tweaks. 2013-06-04 16:25:41 +04:00
Aranclanos
799ed74a3c Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds) 2013-06-04 13:47:26 +04:00
rockdtben@gmail.com
8203e7dced Push sparks lag to GC this should greatly reduce lags. 
Test: 20 emitters shooting for 10 minutes. No lag. Along with other various tests.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5757 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-06-04 13:30:07 +04:00
Chinsky
abc2e6b96b Merge pull request #2903 from fauxki/bleeding-edge-freeze 
DON'T MERGE - BEF - Bar / Holodeck / Theatre / Hydroponics Revamp
 2013-06-03 01:59:33 -07:00
Segrain
3d41e24664 Minor tweaks to spawning medical clothes. 2013-06-02 23:01:33 +03:00
VitrescentTortoise
5bcb4f4bcb Added hidden fingerprint to crayon drawings. 2013-06-01 16:19:48 -07:00