Chinsky
f89d1c050e
Merge pull request #3061 from Kilakk/bleeding-edge-freeze
...
Added access_xenoarch
2013-06-16 09:07:09 -07:00
Whitellama
d23b758006
WIP: Implementing space ninja gamemode
2013-06-15 16:09:23 -07:00
Albert Iordache
8692d7f697
Merge pull request #3077 from comma/bleeding-edge-freeze
...
Added Local OOC verb.
2013-06-15 04:41:29 -07:00
Chinsky
71e47fcd1c
Added Local OOC verb.
...
Visible to those in view and all admins.
2013-06-15 15:36:55 +04: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
Kilakk
ccd7bd6dae
Changelog again
2013-06-13 13:02:39 -04: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
Kilakk
c98fe26816
Adds access_xenoarch "Xenoarchaeology"
...
* Tested this, it works with the ID computer and with scientists on
spawn-in
* Scientists hold on to their access to xenoarch for now
2013-06-12 23:52:41 -04:00
meyar
4098cd9410
Fixes the player requirements, forgot to revert them from testing.
2013-06-12 20:52:49 -04:00
meyar
d965c23bd9
Removes the syndicate nuke agent last name system.
2013-06-12 20:46:59 -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
91008c4d38
Amending a previous fix due to new ERT code from bef.
2013-06-12 20:47:04 -07:00
Zuhayr
fa79834e1b
Merge resolution.
2013-06-12 20:31:29 -07:00
Zuhayr
6bd685bcb2
Compilation fix for ERT code.
2013-06-12 12:30:28 -07:00
Zuhayr
7cd54ac387
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-12 11:41:08 -07:00
Chinsky
8c23dc60f7
Merge pull request #3046 from meyar/bleeding-edge-freeze
...
Emergency Response Team Mega Update! Weee
2013-06-12 03:21:42 -07:00
Zuhayr
7db6cd4108
Added shrapnel from projectile wounds and altered scanner readout.
2013-06-12 01:45:07 -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
meyar
494887a9b5
Typo fix
2013-06-11 16:58:32 -04:00
meyar
1203a32bbe
Typo fix
2013-06-11 16:58:13 -04:00
Kilakk
6c8423aed0
Merge remote-tracking branch 'upstream/bleeding-edge-freeze' into bleeding-edge-freeze
2013-06-11 16:25:42 -04:00
Zuhayr
d0e15b3608
Harpoon, harpoon sprites, removed pneumatic cannon sprites from human.dmi.
2013-06-11 13:15:33 -07:00
Chinsky
3c56e6dacb
Merge pull request #3043 from Baystation12/master
...
Fix for pods
2013-06-11 12:32:47 -07:00
Chinsky
e638540b4c
Merge pull request #3041 from meyar/master
...
Emergency map fix: Security escape pod
2013-06-11 12:29:41 -07:00
meyar
f03f8c9b66
Disables debug(poorly made debug) verb for ERT. This -may- be behind my BEF fix, but I suck at git and can't exclude this because I am dumb :c
2013-06-11 15:25:59 -04: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
meyar
38feb46839
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-11 15:00:22 -04:00
Zuhayr
de2b8b8087
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-11 11:51:48 -07:00
Zuhayr
0fb234d6a4
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-10 22:35:42 -07:00
Zuhayr
98d31e9191
Preliminary work for pneumatic cannons (WIP, no sprites, broken gun)
2013-06-10 22:35:01 -07: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
Kilakk
32b0ad2dfa
Adds "Xenobiologist" as its own separate job
2013-06-10 21:45:07 -04:00
Zuhayr
bc2db268cc
Vox oxygen toxicity, vox breath mask, nitrogen tank for spawning.
2013-06-10 17:16:54 -07:00
Zuhayr
38b44b2441
Items for wizard den, mental focus added to spellbook.
2013-06-10 14:56:47 -07:00
Zuhayr
85b945cfbf
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-10 14:42:46 -07:00
Chinsky
6dc2d9d2dc
Merge pull request #3015 from comma/master
...
Fix
2013-06-10 11:50:50 -07:00
Chinsky
0f9b53ef09
Merge pull request #3016 from NicholasDV/tweaksAndFixes
...
Tweaks and fixes
2013-06-10 02:39:40 -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
b50216cec6
Fixes #3017
...
Looks like will have to put speshul check back...
2013-06-09 19:54:43 +04:00
Chinsky
eaf6b64277
Compile fix.
2013-06-09 19:53:08 +04:00
NicholasDV
adde619a06
Fixes an issue in grammar!
...
Specifically, the way that it was coded made it so that the word
the would appear twice. There... really wasn't a way to fix that
in a way that would effect a lot more things, that I could find.
As a result, I simply reworded it so that it can work with or without
the word, 'the'.
closes #2771
2013-06-09 03:40:27 -04:00
Segrain
673f3ddb37
Fix for ordering hidden supplypacks.
2013-06-09 10:25:27 +03:00
